[Bf-blender-cvs] [1de61696fd2] blender2.8: Correct constraint manipulator colors

Campbell Barton noreply at git.blender.org
Sat Apr 8 04:10:06 CEST 2017


Commit: 1de61696fd2ffc9d800a2eff964045b90c9f2347
Author: Campbell Barton
Date:   Sat Apr 8 12:08:51 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB1de61696fd2ffc9d800a2eff964045b90c9f2347

Correct constraint manipulator colors

Widget show as color of constrained axis

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

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

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

diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c
index e12f1b4286a..024d465e29c 100644
--- a/source/blender/editors/transform/transform_manipulator.c
+++ b/source/blender/editors/transform/transform_manipulator.c
@@ -367,22 +367,22 @@ static void manipulator_get_axis_color(
 		case MAN_AXIS_TRANS_X:
 		case MAN_AXIS_ROT_X:
 		case MAN_AXIS_SCALE_X:
-		case MAN_AXIS_TRANS_XY:
-		case MAN_AXIS_SCALE_XY:
+		case MAN_AXIS_TRANS_YZ:
+		case MAN_AXIS_SCALE_YZ:
 			UI_GetThemeColor4fv(TH_AXIS_X, r_col);
 			break;
 		case MAN_AXIS_TRANS_Y:
 		case MAN_AXIS_ROT_Y:
 		case MAN_AXIS_SCALE_Y:
-		case MAN_AXIS_TRANS_YZ:
-		case MAN_AXIS_SCALE_YZ:
+		case MAN_AXIS_TRANS_ZX:
+		case MAN_AXIS_SCALE_ZX:
 			UI_GetThemeColor4fv(TH_AXIS_Y, r_col);
 			break;
 		case MAN_AXIS_TRANS_Z:
 		case MAN_AXIS_ROT_Z:
 		case MAN_AXIS_SCALE_Z:
-		case MAN_AXIS_TRANS_ZX:
-		case MAN_AXIS_SCALE_ZX:
+		case MAN_AXIS_TRANS_XY:
+		case MAN_AXIS_SCALE_XY:
 			UI_GetThemeColor4fv(TH_AXIS_Z, r_col);
 			break;
 		case MAN_AXIS_TRANS_C:




More information about the Bf-blender-cvs mailing list