Merge pull request OpenMW#2083 from AnyOldName3/fix-vao-rig-bug

Fix animation bug with VAOs
tjurtsch · Dec 19, 2018 · 0f9f7f0 · 0f9f7f0
2 parents 066b74e + 53188f6
commit 0f9f7f0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/components/sceneutil/morphgeometry.cpp b/components/sceneutil/morphgeometry.cpp
@@ -2,6 +2,8 @@
 
 #include <cassert>
 
+#include <osg/Version>
+
 namespace SceneUtil
 {
 
@@ -176,6 +178,10 @@ void MorphGeometry::cull(osg::NodeVisitor *nv)
 
     positionDst->dirty();
 
+#if OSG_MIN_VERSION_REQUIRED(3, 5, 6)
+    geom.dirtyGLObjects();
+#endif
+
     nv->pushOntoNodePath(&geom);
     nv->apply(geom);
     nv->popFromNodePath();

diff --git a/components/sceneutil/riggeometry.cpp b/components/sceneutil/riggeometry.cpp
@@ -3,6 +3,8 @@
 #include <stdexcept>
 #include <cstdlib>
 
+#include <osg/Version>
+
 #include <components/debug/debuglog.hpp>
 
 #include "skeleton.hpp"
@@ -235,6 +237,10 @@ void RigGeometry::cull(osg::NodeVisitor* nv)
     if (tangentDst)
         tangentDst->dirty();
 
+#if OSG_MIN_VERSION_REQUIRED(3, 5, 6)
+    geom.dirtyGLObjects();
+#endif
+
     nv->pushOntoNodePath(&geom);
     nv->apply(geom);
     nv->popFromNodePath();