[Bf-blender-cvs] [de669c3b602] master: WM: ensure 3D view theme is used in select-loop

[Campbell Barton]

Commit: de669c3b602fbc81cd015b06c18f2de6414ba749
Author: Campbell Barton
Date:   Fri Aug 25 22:10:27 2017 +1000
Branches: master
https://developer.blender.org/rBde669c3b602fbc81cd015b06c18f2de6414ba749

WM: ensure 3D view theme is used in select-loop

Yet another case where theme could be used uninitialized.

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

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

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

diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 56508ea989a..3d35d828e93 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -2523,9 +2523,14 @@ void ED_view3d_draw_select_loop(
         ViewContext *vc, Scene *scene, View3D *v3d, ARegion *ar,
         bool use_obedit_skip, bool use_nearest)
 {
+	struct bThemeState theme_state;
 	short code = 1;
 	const short dflag = DRAW_PICKING | DRAW_CONSTCOLOR;
 
+	/* Tools may request depth outside of regular drawing code. */
+	UI_Theme_Store(&theme_state);
+	UI_SetTheme(SPACE_VIEW3D, RGN_TYPE_WINDOW);
+
 	if (vc->obedit && vc->obedit->type == OB_MBALL) {
 		draw_object(scene, ar, v3d, BASACT, dflag);
 	}
@@ -2569,6 +2574,8 @@ void ED_view3d_draw_select_loop(
 			}
 		}
 	}
+
+	UI_Theme_Restore(&theme_state);
 }
 
 typedef struct View3DShadow {