From b22fb7a7bf8e7a3e198d1d40bdc12b15f4fc049a Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Tue, 21 Sep 2021 20:39:31 +0000
Subject: [PATCH] consolidate node mask checks (#3125)

* consolidate node mask checks

This PR simplifies a few checks against node masks in object paging by using the osg provided `setTraversalMask`.

* objectpaging.cpp
---
 apps/openmw/mwrender/objectpaging.cpp | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index 376c517d59..47eacbe1a2 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -272,7 +272,7 @@ namespace MWRender
          : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
          , mCurrentStateSet(nullptr)
          , mCurrentDistance(0.f)
-         , mAnalyzeMask(analyzeMask) {}
+        { setTraversalMask(analyzeMask); }
 
         typedef std::unordered_map<osg::StateSet*, unsigned int> StateSetCounter;
         struct Result
@@ -283,9 +283,6 @@ namespace MWRender
 
         void apply(osg::Node& node) override
         {
-            if (!(node.getNodeMask() & mAnalyzeMask))
-                return;
-
             if (node.getStateSet())
                 mCurrentStateSet = node.getStateSet();
 
@@ -308,9 +305,6 @@ namespace MWRender
         }
         void apply(osg::Geometry& geom) override
         {
-            if (!(geom.getNodeMask() & mAnalyzeMask))
-                return;
-
             if (osg::Array* array = geom.getVertexArray())
                 mResult.mNumVerts += array->getNumElements();
 
@@ -345,7 +339,6 @@ namespace MWRender
         osg::StateSet* mCurrentStateSet;
         StateSetCounter mGlobalStateSetCounter;
         float mCurrentDistance;
-        osg::Node::NodeMask mAnalyzeMask;
     };
 
     class DebugVisitor : public osg::NodeVisitor