[Bf-blender-cvs] [1c92ffa1499] master: Transform: scale center override by aspect

[Campbell Barton]

Commit: 1c92ffa1499cf692d7fd0802d761fcfa244afc83
Author: Campbell Barton
Date:   Tue Aug 29 16:01:16 2017 +1000
Branches: master
https://developer.blender.org/rB1c92ffa1499cf692d7fd0802d761fcfa244afc83

Transform: scale center override by aspect

Needed for image space.

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

M       source/blender/editors/transform/transform_generics.c
M       source/blender/editors/transform/transform_ops.c

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

diff --git a/source/blender/editors/transform/transform_generics.c 
b/source/blender/editors/transform/transform_generics.c
index 65c8f70c06d..179b68dd270 100644
--- a/source/blender/editors/transform/transform_generics.c
+++ b/source/blender/editors/transform/transform_generics.c
@@ -1332,11 +1332,6 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator 
*op, const wmEvent *eve
                }
        }
 
-       if (op && (prop = RNA_struct_find_property(op->ptr, "center_override")) 
&& RNA_property_is_set(op->ptr, prop)) {
-               RNA_property_float_get_array(op->ptr, prop, t->center);
-               t->flag |= T_OVERRIDE_CENTER;
-       }
-
        if (op && ((prop = RNA_struct_find_property(op->ptr, 
"release_confirm")) &&
                   RNA_property_is_set(op->ptr, prop)))
        {
@@ -1440,6 +1435,13 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator 
*op, const wmEvent *eve
 #endif
 
        setTransformViewAspect(t, t->aspect);
+
+       if (op && (prop = RNA_struct_find_property(op->ptr, "center_override")) 
&& RNA_property_is_set(op->ptr, prop)) {
+               RNA_property_float_get_array(op->ptr, prop, t->center);
+               mul_v3_v3(t->center, t->aspect);
+               t->flag |= T_OVERRIDE_CENTER;
+       }
+
        setTransformViewMatrices(t);
        initNumInput(&t->num);
 }
diff --git a/source/blender/editors/transform/transform_ops.c 
b/source/blender/editors/transform/transform_ops.c
index 273d312eccb..1aa800f9fb1 100644
--- a/source/blender/editors/transform/transform_ops.c
+++ b/source/blender/editors/transform/transform_ops.c
@@ -570,7 +570,7 @@ void Transform_Properties(struct wmOperatorType *ot, int 
flags)
                prop = RNA_def_property(ot->srna, "center_override", 
PROP_FLOAT, PROP_XYZ);
                RNA_def_property_array(prop, 3);
                RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE);
-               RNA_def_property_ui_text(prop, "Center", "Force using this 
center value (when set)");
+               RNA_def_property_ui_text(prop, "Center Override", "Force using 
this center value (when set)");
        }
 
        if ((flags & P_NO_DEFAULTS) == 0) {

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs