[Bf-blender-cvs] [9d8c05f7ecf] blender2.8: tmp

[mano-wii]

Commit: 9d8c05f7ecf6c20d48c3b151653bab5cc1b988aa
Author: mano-wii
Date:   Thu Oct 4 09:14:56 2018 -0300
Branches: blender2.8
https://developer.blender.org/rB9d8c05f7ecf6c20d48c3b151653bab5cc1b988aa

tmp

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

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

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

diff --git a/source/blender/editors/transform/transform_gizmo_3d.c 
b/source/blender/editors/transform/transform_gizmo_3d.c
index a3f620fb3fe..4e964c3f2b2 100644
--- a/source/blender/editors/transform/transform_gizmo_3d.c
+++ b/source/blender/editors/transform/transform_gizmo_3d.c
@@ -93,6 +93,8 @@
 
 #include "DEG_depsgraph_query.h"
 
+#include "wm.h"
+
 /* return codes for select, and drawing flags */
 
 #define MAN_TRANS_X            (1 << 0)
@@ -1242,7 +1244,8 @@ static void gizmo_xform_message_subscribe(
 
 void drawDial3d(const TransInfo *t)
 {
-       if (t->mode == TFM_ROTATION && t->spacetype == SPACE_VIEW3D) {
+       wmGizmo *gz = wm_gizmomap_highlight_get(t->ar->gizmo_map);
+       if (t->mode == TFM_ROTATION && t->spacetype == SPACE_VIEW3D && gz != 
NULL) {
                float mat_basis[4][4];
                float mat_final[4][4];
                float color[4];

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs