From ed154f0e2c3a38bd0d7923ee409ecacc4e214b93 Mon Sep 17 00:00:00 2001 From: capostrophic Date: Thu, 8 Aug 2019 18:41:43 +0300 Subject: [PATCH] Fix typo and replace failsave with an assert --- components/nifosg/nifloader.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp index 25e5a3864..d4ecee0e8 100644 --- a/components/nifosg/nifloader.cpp +++ b/components/nifosg/nifloader.cpp @@ -1134,8 +1134,7 @@ namespace NifOsg void handleTriShape(const Nif::Node* nifNode, osg::Group* parentNode, SceneUtil::CompositeStateSetUpdater* composite, const std::vector& boundTextures, int animflags) { - if (nifNode->recType != Nif::RC_NiTriShape && nifNode->recType != Nif::RC_NiTriStrips) - return; + assert(nifNode->recType == Nif::RC_NiTriShape || nifNode->recType == Nif::RC_NiTriStrips); osg::ref_ptr drawable; osg::ref_ptr geom (new osg::Geometry); @@ -1197,12 +1196,11 @@ namespace NifOsg void handleSkinnedTriShape(const Nif::Node *nifNode, osg::Group *parentNode, SceneUtil::CompositeStateSetUpdater* composite, const std::vector& boundTextures, int animflags) { - if (nifNode->recType != Nif::RC_NiTriShape && nifNode->recType != Nif::RC_NiTriStrips) - return; + assert(nifNode->recType == Nif::RC_NiTriShape || nifNode->recType == Nif::RC_NiTriStrips); osg::ref_ptr geometry (new osg::Geometry); Nif::NiSkinInstancePtr skinPtr; - if (nifNode->recType != Nif::RC_NiTriShape) + if (nifNode->recType == Nif::RC_NiTriShape) { const Nif::NiTriShape* triShape = static_cast(nifNode); triShapeToGeometry(triShape, geometry, parentNode, composite, boundTextures, animflags);