krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1848 from Capostrophic/texturing

Browse source 
Don't render NiTriShapes without NiTexturingProperty (bug #4483)
This commit is contained in:
Bret Curtis 2018-08-06 08:34:23 +02:00 committed by GitHub
commit a9729878d7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

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

4
components/nifosg/nifloader.cpp
View file

@ -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) if(nifNode->recType == Nif::RC_NiAutoNormalParticles || nifNode->recType == Nif::RC_NiRotatingParticles)
handleParticleSystem(nifNode, node, composite, animflags, rootNode); handleParticleSystem(nifNode, node, composite, animflags, rootNode);