[Bf-blender-cvs] [7e43210edbd] master: WM: move theme check out of ED_view3d_draw_select_loop

[Campbell Barton]

Commit: 7e43210edbd9ff3148f9564a9c90d0687dde9363
Author: Campbell Barton
Date:   Sun Aug 27 00:48:52 2017 +1000
Branches: master
https://developer.blender.org/rB7e43210edbd9ff3148f9564a9c90d0687dde9363

WM: move theme check out of ED_view3d_draw_select_loop

In 2.8x this needs to be in view3d_opengl_select,
so simplest to make in master too.

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

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

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

diff --git a/source/blender/editors/space_view3d/view3d_draw.c 
b/source/blender/editors/space_view3d/view3d_draw.c
index 3d35d828e93..56508ea989a 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -2523,14 +2523,9 @@ 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);
        }
@@ -2574,8 +2569,6 @@ void ED_view3d_draw_select_loop(
                        }
                }
        }
-
-       UI_Theme_Restore(&theme_state);
 }
 
 typedef struct View3DShadow {
diff --git a/source/blender/editors/space_view3d/view3d_view.c 
b/source/blender/editors/space_view3d/view3d_view.c
index 1c919ba1e75..16b626a5be4 100644
--- a/source/blender/editors/space_view3d/view3d_view.c
+++ b/source/blender/editors/space_view3d/view3d_view.c
@@ -54,6 +54,8 @@
 #include "BIF_gl.h"
 #include "BIF_glutil.h"
 
+#include "UI_resources.h"
+
 #include "GPU_select.h"
 
 #include "WM_api.h"
@@ -1206,6 +1208,7 @@ int view3d_opengl_select(
         ViewContext *vc, unsigned int *buffer, unsigned int bufsize, const 
rcti *input,
         eV3DSelectMode select_mode)
 {
+       struct bThemeState theme_state;
        Scene *scene = vc->scene;
        View3D *v3d = vc->v3d;
        ARegion *ar = vc->ar;
@@ -1250,6 +1253,10 @@ int view3d_opengl_select(
                }
        }
 
+       /* Tools may request depth outside of regular drawing code. */
+       UI_Theme_Store(&theme_state);
+       UI_SetTheme(SPACE_VIEW3D, RGN_TYPE_WINDOW);
+
        /* Re-use cache (rect must be smaller then the cached)
         * other context is assumed to be unchanged */
        if (GPU_select_is_cached()) {
@@ -1302,6 +1309,8 @@ int view3d_opengl_select(
 finally:
        if (hits < 0) printf("Too many objects in select buffer\n");  /* XXX 
make error message */
 
+       UI_Theme_Restore(&theme_state);
+
        return hits;
 }

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