diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2012-05-09 19:00:26 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2012-05-09 19:00:26 +0400 |
| commit | 318b44fe5d142ca1ac29a6933da8cd9e2c439e9a (patch) | |
| tree | 5dd43e6332ba8005a5ae29126a8ad37c6147fd48 /source/blender/modifiers/intern/MOD_shapekey.c | |
| parent | 895e426e2661b4969a9aaa6d1c526253e2e9e1d4 (diff) | |
Refactor of modifiers' apply function: now use a single bit-flag parameter to pass options, instead of having one parameter per boolean flag (i.e. replaces current useRenderParams and isFinalCalc by a single ModifierApplyFlag flag. ModifierApplyFlag is an enum defined in BKE_modifier.h). This way we won't anymore have to edit all modifier files when e.g. adding a new control flag!
Should have no effect over modifier behavior.
Diffstat (limited to 'source/blender/modifiers/intern/MOD_shapekey.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_shapekey.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/modifiers/intern/MOD_shapekey.c b/source/blender/modifiers/intern/MOD_shapekey.c index 0f67eb4dd1a..3353382fa3d 100644 --- a/source/blender/modifiers/intern/MOD_shapekey.c +++ b/source/blender/modifiers/intern/MOD_shapekey.c @@ -52,8 +52,7 @@ static void deformVerts(ModifierData *md, Object *ob, DerivedMesh *UNUSED(derivedData), float (*vertexCos)[3], int numVerts, - int UNUSED(useRenderParams), - int UNUSED(isFinalCalc)) + ModifierApplyFlag UNUSED(flag)) { KeyBlock *kb = ob_get_keyblock(ob); float (*deformedVerts)[3]; @@ -86,7 +85,7 @@ static void deformMatrices(ModifierData *md, Object *ob, DerivedMesh *derivedDat copy_m3_m3(defMats[a], scale); } - deformVerts(md, ob, derivedData, vertexCos, numVerts, 0, 0); + deformVerts(md, ob, derivedData, vertexCos, numVerts, 0); } static void deformVertsEM(ModifierData *md, Object *ob, @@ -98,7 +97,7 @@ static void deformVertsEM(ModifierData *md, Object *ob, Key *key = ob_get_key(ob); if (key && key->type == KEY_RELATIVE) - deformVerts(md, ob, derivedData, vertexCos, numVerts, 0, 0); + deformVerts(md, ob, derivedData, vertexCos, numVerts, 0); } static void deformMatricesEM(ModifierData *UNUSED(md), Object *ob, |