Merge pull request #1848 from Capostrophic/texturing

Don't render NiTriShapes without NiTexturingProperty (bug #4483)

CHANGELOG.md

@@ -65,6 +65,7 @@
     Bug #4475: Scripted animations should not cause movement
     Bug #4479: "Game" category on Advanced page is getting too long
     Bug #4480: Segfault in QuickKeysMenu when item no longer in inventory
+    Bug #4483: Shapes without NiTexturingProperty are rendered
     Bug #4489: Goodbye doesn't block dialogue hyperlinks
     Bug #4490: PositionCell on player gives "Error: tried to add local script twice"
     Bug #4494: Training cap based off Base Skill instead of Modified Skill

components/nifosg/nifloader.cpp

@@ -573,6 +573,10 @@ namespace NifOsg
                 }
             }
 
+            // Make sure we don't render untextured shapes
+            if (nifNode->recType == Nif::RC_NiTriShape && boundTextures.empty())
+                node->setNodeMask(0x1);
+
             if(nifNode->recType == Nif::RC_NiAutoNormalParticles || nifNode->recType == Nif::RC_NiRotatingParticles)
                 handleParticleSystem(nifNode, node, composite, animflags, rootNode);