mirror of
https://github.com/OpenMW/openmw.git
synced 2025-10-15 13:56:34 +00:00
make sure we apply extra data statesets at right time
This commit is contained in:
parent
c8eb28331a
commit
f2a82701b4
1 changed files with 4 additions and 4 deletions
|
@ -797,10 +797,6 @@ namespace NifOsg
|
||||||
if (nifNode->recType == Nif::RC_NiParticles)
|
if (nifNode->recType == Nif::RC_NiParticles)
|
||||||
handleParticleSystem(nifNode, parent, node, composite, args.mAnimFlags);
|
handleParticleSystem(nifNode, parent, node, composite, args.mAnimFlags);
|
||||||
|
|
||||||
// Apply any extra effects after processing the nodes children and particle system handling
|
|
||||||
if (!extraData.empty())
|
|
||||||
handleExtraData(extraData, node);
|
|
||||||
|
|
||||||
const bool isNiGeometry = isTypeNiGeometry(nifNode->recType);
|
const bool isNiGeometry = isTypeNiGeometry(nifNode->recType);
|
||||||
const bool isBSGeometry = isTypeBSGeometry(nifNode->recType);
|
const bool isBSGeometry = isTypeBSGeometry(nifNode->recType);
|
||||||
const bool isGeometry = isNiGeometry || isBSGeometry;
|
const bool isGeometry = isNiGeometry || isBSGeometry;
|
||||||
|
@ -832,6 +828,10 @@ namespace NifOsg
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Apply any extra effects after processing the nodes children and particle system handling
|
||||||
|
if (!extraData.empty())
|
||||||
|
handleExtraData(extraData, node);
|
||||||
|
|
||||||
if (composite->getNumControllers() > 0)
|
if (composite->getNumControllers() > 0)
|
||||||
{
|
{
|
||||||
osg::Callback* cb = composite;
|
osg::Callback* cb = composite;
|
||||||
|
|
Loading…
Reference in a new issue