[Bf-blender-cvs] [3bba558] master: Fix T40269: Transform Constraint Doesn't Obey World/World Setting (Inherits from Parent instead!)

Bastien Montagne noreply at git.blender.org
Tue May 20 15:24:41 CEST 2014


Commit: 3bba558944a280daa4b1dbb027b65583dfe0f7fe
Author: Bastien Montagne
Date:   Tue May 20 15:21:33 2014 +0200
https://developer.blender.org/rB3bba558944a280daa4b1dbb027b65583dfe0f7fe

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).

===================================================================

M	source/blender/blenkernel/intern/constraint.c

===================================================================

diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index 52cfa92..a2fb06e 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:




More information about the Bf-blender-cvs mailing list