mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 09:35:28 +00:00
Code Issues Projects Releases Wiki Activity

Remove redundant parameter

Browse Source
This commit is contained in:
Allofich 2016-09-18 01:57:47 +09:00
parent 5aad1d81f4
commit be96ff1fd1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/nifosg/nifloader.cpp
View File

@ -369,7 +369,7 @@ namespace NifOsg
return created; return created;
} }
void applyNodeProperties(const Nif::Node *nifNode, osg::Node *applyTo, SceneUtil::CompositeStateSetUpdater* composite, Resource::ImageManager* imageManager, std::vector<int>& boundTextures, int animflags, bool isRootNode) void applyNodeProperties(const Nif::Node *nifNode, osg::Node *applyTo, SceneUtil::CompositeStateSetUpdater* composite, Resource::ImageManager* imageManager, std::vector<int>& boundTextures, int animflags)
{ {
const Nif::PropertyList& props = nifNode->props; const Nif::PropertyList& props = nifNode->props;
bool foundFirstRootTexturingProperty = false; bool foundFirstRootTexturingProperty = false;
@ -382,7 +382,7 @@ namespace NifOsg
// effect "particle texture" is used. For non-root nodes we keep setting until we have the highest // effect "particle texture" is used. For non-root nodes we keep setting until we have the highest
// numbered one, which is the one that displays in the game and can be overridden if it matches the // numbered one, which is the one that displays in the game and can be overridden if it matches the
// lowest one on the root. // lowest one on the root.
if (!foundFirstRootTexturingProperty && isRootNode && props[i].getPtr()->recType == Nif::RC_NiTexturingProperty) if (!foundFirstRootTexturingProperty && nifNode->parent == NULL && props[i].getPtr()->recType == Nif::RC_NiTexturingProperty)
{ {
int index = props[i].getPtr()->recIndex; int index = props[i].getPtr()->recIndex;
applyTo->setUserValue("overrideIndex", index); applyTo->setUserValue("overrideIndex", index);
@ -651,7 +651,7 @@ namespace NifOsg
osg::ref_ptr<SceneUtil::CompositeStateSetUpdater> composite = new SceneUtil::CompositeStateSetUpdater; osg::ref_ptr<SceneUtil::CompositeStateSetUpdater> composite = new SceneUtil::CompositeStateSetUpdater;
applyNodeProperties(nifNode, node, composite, imageManager, boundTextures, animflags, node == rootNode); applyNodeProperties(nifNode, node, composite, imageManager, boundTextures, animflags);
if (nifNode->recType == Nif::RC_NiTriShape && !skipMeshes) if (nifNode->recType == Nif::RC_NiTriShape && !skipMeshes)
{ {