Commit: 8850875866a653cbdb9dab39d4182c55db3815ac
Author: Campbell Barton
Date: Thu Nov 29 09:41:44 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB8850875866a653cbdb9dab39d4182c55db3815ac
Fix transform axis orientation cycling
This ignored operator defined orientation.
===================================================================
M source/blender/editors/transform/transform_generics.c
===================================================================
diff --git a/source/blender/editors/transform/transform_generics.c
b/source/blender/editors/transform/transform_generics.c
index 9f739765d9c..ba5b81ae641 100644
--- a/source/blender/editors/transform/transform_generics.c
+++ b/source/blender/editors/transform/transform_generics.c
@@ -1399,13 +1399,6 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator
*op, const wmEvent *eve
t->orientation.custom = BKE_scene_transform_orientation_find(
t->scene, t->scene->orientation_index_custom);
- t->orientation.index = 0;
- ARRAY_SET_ITEMS(
- t->orientation.types,
- V3D_MANIP_GLOBAL, /* Value isn't used (first index is
no constraint). */
- t->orientation.user,
- V3D_MANIP_GLOBAL);
-
/* exceptional case */
if (t->around == V3D_AROUND_LOCAL_ORIGINS) {
if (ELEM(t->mode, TFM_ROTATION, TFM_RESIZE,
TFM_TRACKBALL)) {
@@ -1520,6 +1513,13 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator
*op, const wmEvent *eve
t->orientation.custom = custom_orientation;
}
+ t->orientation.index = 0;
+ ARRAY_SET_ITEMS(
+ t->orientation.types,
+ V3D_MANIP_GLOBAL, /* Value isn't used (first index is no
constraint). */
+ t->orientation.user,
+ V3D_MANIP_GLOBAL);
+
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
