mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-27 21:35:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fix-osg-version-check' into 'master'

Browse Source 
Fix FTBFS against older versions of osg

See merge request OpenMW/openmw!1292
This commit is contained in:
psi29a 2021-10-14 06:02:35 +00:00
commit 4cd927b22a
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/sceneutil/morphgeometry.cpp
View File

@ -2,6 +2,8 @@
#include <cassert> #include <cassert>
#include <osg/Version>
namespace SceneUtil namespace SceneUtil
{ {
@ -176,7 +178,9 @@ void MorphGeometry::cull(osg::NodeVisitor *nv)
positionDst->dirty(); positionDst->dirty();
#if OSG_MIN_VERSION_REQUIRED(3, 5, 10)
geom.osg::Drawable::dirtyGLObjects(); geom.osg::Drawable::dirtyGLObjects();
#endif
nv->pushOntoNodePath(&geom); nv->pushOntoNodePath(&geom);
nv->apply(geom); nv->apply(geom);

4
components/sceneutil/riggeometry.cpp
View File

@ -1,5 +1,7 @@
#include "riggeometry.hpp" #include "riggeometry.hpp"
#include <osg/Version>
#include <components/debug/debuglog.hpp> #include <components/debug/debuglog.hpp>
#include <osg/MatrixTransform> #include <osg/MatrixTransform>
@ -247,7 +249,9 @@ void RigGeometry::cull(osg::NodeVisitor* nv)
if (tangentDst) if (tangentDst)
tangentDst->dirty(); tangentDst->dirty();
#if OSG_MIN_VERSION_REQUIRED(3, 5, 10)
geom.osg::Drawable::dirtyGLObjects(); geom.osg::Drawable::dirtyGLObjects();
#endif
nv->pushOntoNodePath(&geom); nv->pushOntoNodePath(&geom);
nv->apply(geom); nv->apply(geom);