TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-04 13:00:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1206 from Areloch/MatAnimFlagsFix

Browse source 
Ensures that material animation flags are cleared when values are changed so they don't "stick"
This commit is contained in:
Brian Roberts 2024-02-04 15:49:30 -06:00 • committed by GitHub
commit 36581246cd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Engine/source/materials/materialDefinition.cpp
View file

@ -790,6 +790,15 @@ DefineEngineMethod(Material, setAnimFlags, void, (S32 id, const char *flags), (0
//if we're still unset, see if they tried assigning a number
if (object->mAnimFlags[id] == 0)
object->mAnimFlags[id] = dAtoi(flags);
//if we're *still* unset, make sure we've cleared all cases
if (object->mAnimFlags[id] == 0)
{
object->mScrollOffset[id].set(0.0f, 0.0f);
object->mRotPos[id] = 0.0f;
object->mWavePos[id] = 0.0f;
}
}
DefineEngineMethod(Material, getFilename, const char*, (), , "Get filename of material")