diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-08-29 09:06:26 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-08-29 09:06:26 +0300 |
| commit | 3d56bfbc8252dd371853f4a34eb29a67cd29337f (patch) | |
| tree | fe4931531cd3a673688d6c6ced8cff459d08f639 /source/blender/editors/transform | |
| parent | db1ffe11b66c235662b32177c00c537b44e331a4 (diff) | |
| parent | 1c92ffa1499cf692d7fd0802d761fcfa244afc83 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/transform')
| -rw-r--r-- | source/blender/editors/transform/transform_generics.c | 12 | ||||
| -rw-r--r-- | source/blender/editors/transform/transform_ops.c | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 5fd34cde3d6..215be83abf4 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -1357,11 +1357,6 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve t->custom_orientation = custom_orientation; } - 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))) { @@ -1465,6 +1460,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 07df5d42a97..d7ed80841da 100644 --- a/source/blender/editors/transform/transform_ops.c +++ b/source/blender/editors/transform/transform_ops.c @@ -564,7 +564,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) { |