diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-07-23 23:31:49 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-07-23 23:31:49 +0400 |
commit | f77405356aa5e1816287b1afe6b6546f518cc1f1 (patch) | |
tree | 3f4404610a8afde49c9b60c59db30900e815739f /source/blender/modifiers/intern | |
parent | 8ef3b51325c39dcf18cf340d41f6e847c902dfbd (diff) |
remove use_relative option from simple deform,
all modifiers should be using object transformations relatively.
Diffstat (limited to 'source/blender/modifiers/intern')
-rw-r--r-- | source/blender/modifiers/intern/MOD_simpledeform.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/source/blender/modifiers/intern/MOD_simpledeform.c b/source/blender/modifiers/intern/MOD_simpledeform.c index 588c98c9827..d6dc8482ee2 100644 --- a/source/blender/modifiers/intern/MOD_simpledeform.c +++ b/source/blender/modifiers/intern/MOD_simpledeform.c @@ -166,14 +166,7 @@ static void SimpleDeformModifier_do(SimpleDeformModifierData *smd, struct Object /* Calculate matrixs do convert between coordinate spaces */ if (smd->origin) { transf = &tmp_transf; - - if (smd->originOpts & MOD_SIMPLEDEFORM_ORIGIN_LOCAL) { - space_transform_from_matrixs(transf, ob->obmat, smd->origin->obmat); - } - else { - copy_m4_m4(transf->local2target, smd->origin->obmat); - invert_m4_m4(transf->target2local, transf->local2target); - } + space_transform_from_matrixs(transf, ob->obmat, smd->origin->obmat); } /* Setup vars, @@ -252,7 +245,6 @@ static void initData(ModifierData *md) SimpleDeformModifierData *smd = (SimpleDeformModifierData *) md; smd->mode = MOD_SIMPLEDEFORM_MODE_TWIST; - smd->originOpts = MOD_SIMPLEDEFORM_ORIGIN_LOCAL; smd->axis = 0; smd->origin = NULL; @@ -269,7 +261,6 @@ static void copyData(ModifierData *md, ModifierData *target) tsmd->mode = smd->mode; tsmd->axis = smd->axis; tsmd->origin = smd->origin; - tsmd->originOpts = smd->originOpts; tsmd->factor = smd->factor; memcpy(tsmd->limit, smd->limit, sizeof(tsmd->limit)); BLI_strncpy(tsmd->vgroup_name, smd->vgroup_name, sizeof(tsmd->vgroup_name)); |