From 8791063110e140f1eadd06a1c2ea191944882804 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 29 Feb 2016 18:20:56 +0100
Subject: [PATCH] Fix "RigGeometry rendering with no skeleton" warnings in rare
 cases

---
 components/sceneutil/skeleton.cpp | 11 ++++++++++-
 components/sceneutil/skeleton.hpp |  2 ++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/components/sceneutil/skeleton.cpp b/components/sceneutil/skeleton.cpp
index d1299c058..f311de246 100644
--- a/components/sceneutil/skeleton.cpp
+++ b/components/sceneutil/skeleton.cpp
@@ -38,6 +38,8 @@ Skeleton::Skeleton()
     , mNeedToUpdateBoneMatrices(true)
     , mActive(true)
     , mLastFrameNumber(0)
+    , mTraversedEvenFrame(false)
+    , mTraversedOddFrame(false)
 {
 
 }
@@ -48,6 +50,8 @@ Skeleton::Skeleton(const Skeleton &copy, const osg::CopyOp &copyop)
     , mNeedToUpdateBoneMatrices(true)
     , mActive(copy.mActive)
     , mLastFrameNumber(0)
+    , mTraversedEvenFrame(false)
+    , mTraversedOddFrame(false)
 {
 
 }
@@ -111,6 +115,11 @@ void Skeleton::updateBoneMatrices(osg::NodeVisitor* nv)
 
     mLastFrameNumber = nv->getTraversalNumber();
 
+    if (mLastFrameNumber % 2 == 0)
+        mTraversedEvenFrame = true;
+    else
+        mTraversedOddFrame = true;
+
     if (mNeedToUpdateBoneMatrices)
     {
         if (mRootBone.get())
@@ -140,7 +149,7 @@ void Skeleton::traverse(osg::NodeVisitor& nv)
     if (!getActive() && nv.getVisitorType() == osg::NodeVisitor::UPDATE_VISITOR
             // need to process at least 2 frames before shutting off update, since we need to have both frame-alternating RigGeometries initialized
             // this would be more naturally handled if the double-buffering was implemented in RigGeometry itself rather than in a FrameSwitch decorator node
-            && mLastFrameNumber != 0 && mLastFrameNumber+2 <= nv.getTraversalNumber())
+            && mLastFrameNumber != 0 && mTraversedEvenFrame && mTraversedOddFrame)
         return;
     osg::Group::traverse(nv);
 }
diff --git a/components/sceneutil/skeleton.hpp b/components/sceneutil/skeleton.hpp
index d98d36751..9ca1dd49d 100644
--- a/components/sceneutil/skeleton.hpp
+++ b/components/sceneutil/skeleton.hpp
@@ -69,6 +69,8 @@ namespace SceneUtil
         bool mActive;
 
         unsigned int mLastFrameNumber;
+        bool mTraversedEvenFrame;
+        bool mTraversedOddFrame;
     };
 
 }