Browse Source

Merge pull request #1206 from Areloch/MatAnimFlagsFix

Ensures that material animation flags are cleared when values are changed so they don't "stick"
Brian Roberts 1 năm trước cách đây
mục cha
commit
36581246cd
1 tập tin đã thay đổi với 9 bổ sung0 xóa
  1. 9 0
      Engine/source/materials/materialDefinition.cpp

+ 9 - 0
Engine/source/materials/materialDefinition.cpp

@@ -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")