diff options
| author | Hans Goudey <h.goudey@me.com> | 2020-09-13 01:22:01 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2020-09-13 01:22:01 +0300 |
| commit | 7b714a9897855ea566cc393a56b9873325c5f836 (patch) | |
| tree | 972a9f238f58fe1a435e61618e8c6bc9714f5bbd /source/blender/draw/intern/draw_manager.c | |
| parent | 3c52c75af2fe21e9c9c96e0914a4ac72388ddb78 (diff) | |
| parent | d78a5f022db729d5d6890718418971912853d55e (diff) | |
Merge branch 'property-search-button-label-pointer' into property-search-move-context-to-panel
Diffstat (limited to 'source/blender/draw/intern/draw_manager.c')
| -rw-r--r-- | source/blender/draw/intern/draw_manager.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index 203f8af130d..834505ca349 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -1365,6 +1365,8 @@ void DRW_draw_callbacks_pre_scene(void) if (DST.draw_ctx.evil_C) { ED_region_draw_cb_draw(DST.draw_ctx.evil_C, DST.draw_ctx.region, REGION_DRAW_PRE_VIEW); + /* Callback can be nasty and do whatever they want with the state. + * Don't trust them! */ DRW_state_reset(); } } @@ -1400,6 +1402,9 @@ void DRW_draw_callbacks_post_scene(void) drw_debug_draw(); GPU_depth_test(GPU_DEPTH_NONE); + /* Apply state for callbacks. */ + GPU_apply_state(); + ED_region_draw_cb_draw(DST.draw_ctx.evil_C, DST.draw_ctx.region, REGION_DRAW_POST_VIEW); /* Callback can be nasty and do whatever they want with the state. |