[Bf-blender-cvs] [48752d8802] blender2.8: OpenGL: Fix Object Axes color

[Clément Foucault]

Commit: 48752d880225c373b1be177b008eec6b9b61d510
Author: Clément Foucault
Date:   Wed Feb 22 14:24:09 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB48752d880225c373b1be177b008eec6b9b61d510

OpenGL: Fix Object Axes color

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

M	source/blender/editors/space_view3d/drawobject.c

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

diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index fb190293d7..1b8acde421 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -8753,7 +8753,13 @@ afterdraw:
 		if (dtx && (G.f & G_RENDER_OGL) == 0) {
 
 			if (dtx & OB_AXIS) {
-				drawaxes(rv3d->viewmatob, 1.0f, OB_ARROWS, NULL);
+				if ((dflag & DRAW_CONSTCOLOR) == 0) {
+					/* prevent random colors being used */
+					drawaxes(rv3d->viewmatob, 1.0f, OB_ARROWS, ob_wire_col);
+				}
+				else {
+					drawaxes(rv3d->viewmatob, 1.0f, OB_ARROWS, NULL);
+				}
 			}
 			if (dtx & OB_DRAWBOUNDOX) {
 				draw_bounding_volume(ob, ob->boundtype);