From a1e3b2e586db4b4243169393b23adbca6499e6fe Mon Sep 17 00:00:00 2001
From: Capostrophic <21265616+Capostrophic@users.noreply.github.com>
Date: Sun, 5 Aug 2018 16:15:28 +0300
Subject: [PATCH] Don't render NiTriShapes without NiTexturingProperty (bug
 #4483)

---
 CHANGELOG.md                    | 1 +
 components/nifosg/nifloader.cpp | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9bacf11f3..a28661372 100644
--- a/CHANGELOG.md
+++ b/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
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 4e7f6d511..b50d75ee2 100644
--- a/components/nifosg/nifloader.cpp
+++ b/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);