diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-08-25 15:22:50 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-08-25 15:22:58 +0300 |
commit | 8e6c18a98f5b006f16873d14198b615631dd48ed (patch) | |
tree | 2b7e1c7bbfae147edc6f4fd7aa204c494045f188 /source/blender/editors/space_view3d/view3d_draw_legacy.c | |
parent | f8f6f8f26eaad3b6d89a57df70114cd4fa40dc79 (diff) | |
parent | de669c3b602fbc81cd015b06c18f2de6414ba749 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_draw_legacy.c')
-rw-r--r-- | source/blender/editors/space_view3d/view3d_draw_legacy.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/editors/space_view3d/view3d_draw_legacy.c b/source/blender/editors/space_view3d/view3d_draw_legacy.c index 6184ed63543..73ffe949823 100644 --- a/source/blender/editors/space_view3d/view3d_draw_legacy.c +++ b/source/blender/editors/space_view3d/view3d_draw_legacy.c @@ -1291,9 +1291,15 @@ void ED_view3d_draw_select_loop( const struct EvaluationContext *eval_ctx, ViewContext *vc, Scene *scene, SceneLayer *sl, 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(eval_ctx, scene, sl, ar, v3d, BASACT_NEW(sl), dflag); } @@ -1336,6 +1342,8 @@ void ED_view3d_draw_select_loop( } } } + + UI_Theme_Restore(&theme_state); } typedef struct View3DShadow { |