From 42bd10f3560902387db13f71501db29e1200b946 Mon Sep 17 00:00:00 2001 From: Dan Church Date: Wed, 13 Oct 2021 13:46:08 -0500 Subject: [PATCH] Fix FTBFS against older versions of osg Bring back osg version guard. Drawable::dirtyGLObjects wasn't available until OpenSceneGraph-3.5.10. --- components/sceneutil/morphgeometry.cpp | 4 ++++ components/sceneutil/riggeometry.cpp | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/components/sceneutil/morphgeometry.cpp b/components/sceneutil/morphgeometry.cpp index 355403b066..78be559989 100644 --- a/components/sceneutil/morphgeometry.cpp +++ b/components/sceneutil/morphgeometry.cpp @@ -2,6 +2,8 @@ #include +#include + namespace SceneUtil { @@ -176,7 +178,9 @@ void MorphGeometry::cull(osg::NodeVisitor *nv) positionDst->dirty(); +#if OSG_MIN_VERSION_REQUIRED(3, 5, 10) geom.osg::Drawable::dirtyGLObjects(); +#endif nv->pushOntoNodePath(&geom); nv->apply(geom); diff --git a/components/sceneutil/riggeometry.cpp b/components/sceneutil/riggeometry.cpp index 2ca90d2c78..ec00efa535 100644 --- a/components/sceneutil/riggeometry.cpp +++ b/components/sceneutil/riggeometry.cpp @@ -1,5 +1,7 @@ #include "riggeometry.hpp" +#include + #include #include @@ -247,7 +249,9 @@ void RigGeometry::cull(osg::NodeVisitor* nv) if (tangentDst) tangentDst->dirty(); +#if OSG_MIN_VERSION_REQUIRED(3, 5, 10) geom.osg::Drawable::dirtyGLObjects(); +#endif nv->pushOntoNodePath(&geom); nv->apply(geom);