[Bf-blender-cvs] [f92c118] wiggly-widgets: Fix rotation manipulator not hidden completely with all axes locked

Julian Eisel noreply at git.blender.org
Tue Aug 18 09:14:51 CEST 2015


Commit: f92c118978cb9202cc488430ef6c8c9736361fbc
Author: Julian Eisel
Date:   Tue Aug 18 09:11:41 2015 +0200
Branches: wiggly-widgets
https://developer.blender.org/rBf92c118978cb9202cc488430ef6c8c9736361fbc

Fix rotation manipulator not hidden completely with all axes locked

Similar fix as rB6885d316b1b4e275, but had to fix it here too since we've duplicated that code.
Also removed unused defines.

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

M	source/blender/editors/transform/manipulator_widget.c

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

diff --git a/source/blender/editors/transform/manipulator_widget.c b/source/blender/editors/transform/manipulator_widget.c
index bc07a4a..990303b 100644
--- a/source/blender/editors/transform/manipulator_widget.c
+++ b/source/blender/editors/transform/manipulator_widget.c
@@ -91,9 +91,7 @@
 #define MAN_ROT_X    (1 << 3)
 #define MAN_ROT_Y    (1 << 4)
 #define MAN_ROT_Z    (1 << 5)
-#define MAN_ROT_V    (1 << 6)
-#define MAN_ROT_T    (1 << 7)
-#define MAN_ROT_C    (MAN_ROT_X | MAN_ROT_Y | MAN_ROT_Z | MAN_ROT_V | MAN_ROT_T)
+#define MAN_ROT_C    (MAN_ROT_X | MAN_ROT_Y | MAN_ROT_Z)
 
 #define MAN_SCALE_X  (1 << 8)
 #define MAN_SCALE_Y  (1 << 9)
@@ -109,8 +107,6 @@ enum {
 	MAN_SEL_ROT_X,
 	MAN_SEL_ROT_Y,
 	MAN_SEL_ROT_Z,
-	MAN_SEL_ROT_V,
-	MAN_SEL_ROT_T,
 
 	MAN_SEL_SCALE_X,
 	MAN_SEL_SCALE_Y,




More information about the Bf-blender-cvs mailing list