Commit: 8cd2b6ca8e2411e113e882b4adbc7755fef98a2b
Author: Campbell Barton
Date: Mon Aug 28 16:04:42 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB8cd2b6ca8e2411e113e882b4adbc7755fef98a2b
Merge branch 'master' into blender2.8
===================================================================
===================================================================
diff --cc source/blender/editors/transform/transform_generics.c
index a0eee4296c1,65c8f70c06d..c8f7c6f3010
--- a/source/blender/editors/transform/transform_generics.c
+++ b/source/blender/editors/transform/transform_generics.c
@@@ -1339,24 -1325,18 +1339,29 @@@ void initTransInfo(bContext *C, TransIn
if (op && ((prop = RNA_struct_find_property(op->ptr,
"constraint_orientation")) &&
RNA_property_is_set(op->ptr, prop)))
{
- t->current_orientation = RNA_property_enum_get(op->ptr, prop);
+ short orientation = RNA_property_enum_get(op->ptr, prop);
+ TransformOrientation *custom_orientation = NULL;
- if (t->current_orientation >= V3D_MANIP_CUSTOM +
BIF_countTransformOrientation(C)) {
- t->current_orientation = V3D_MANIP_GLOBAL;
+ if (orientation >= V3D_MANIP_CUSTOM) {
+ if (orientation >= V3D_MANIP_CUSTOM +
BIF_countTransformOrientation(C)) {
+ orientation = V3D_MANIP_GLOBAL;
+ }
+ else {
+ custom_orientation =
BKE_workspace_transform_orientation_find(
+ CTX_wm_workspace(C),
orientation - V3D_MANIP_CUSTOM);
+ orientation = V3D_MANIP_CUSTOM;
+ }
}
+
+ t->current_orientation = orientation;
+ 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)))
{
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
