diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2014-05-20 17:21:33 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2014-05-20 17:21:33 +0400 |
| commit | 3bba558944a280daa4b1dbb027b65583dfe0f7fe (patch) | |
| tree | a72d1c9b50c7e3dc878ce27b860ac9bd79a192b5 /source/blender/blenkernel | |
| parent | c28f2ed4898b582b3efc67aef7f4f01b9e9ac7bd (diff) | |
Fix T40269: Transform Constraint Doesn't Obey World/World Setting (Inherits from Parent instead!)
Revert small part of own rB8714ae09f894, which changed scale setting from absolute to relative
(was good in absolute, but bad because it breaks existing rigs).
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/constraint.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index 52cfa92ceaf..a2fb06e9797 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -3267,7 +3267,9 @@ static void transform_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *t to_max = data->to_max_scale; for (i = 0; i < 3; i++) { /* multiply with original scale (so that it can still be scaled) */ - size[i] *= to_min[i] + (sval[(int)data->map[i]] * (to_max[i] - to_min[i])); + /* size[i] *= to_min[i] + (sval[(int)data->map[i]] * (to_max[i] - to_min[i])); */ + /* Stay absolute, else it breaks existing rigs... sigh. */ + size[i] = to_min[i] + (sval[(int)data->map[i]] * (to_max[i] - to_min[i])); } break; case TRANS_ROTATION: |