blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Fix transform axis orientation cycling 

This ignored operator defined orientation.
This commit is contained in:
Campbell Barton 2018-11-29 09:41:44 +11:00
parent f1edccdbe1
commit 8850875866
Notes: blender-bot 2024-01-16 18:05:25 +01:00 
Referenced by issue #58146, OpenColorIO Crash with 2nd Scene
Referenced by issue #58148, Cycles GPU rendering not working properly GTX Titan (?misses light path bounces)
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/editors/transform/transform_generics.c
View File

@ -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)))
{