Merge branch 'master' into blender2.8
authorSybren A. Stüvel <sybren@stuvel.eu>
Fri, 16 Nov 2018 13:05:05 +0000 (14:05 +0100)
committerSybren A. Stüvel <sybren@stuvel.eu>
Fri, 16 Nov 2018 13:05:05 +0000 (14:05 +0100)
source/blender/editors/space_clip/space_clip.c

index 10f7777ee31de87cd33b18bfc622696a77136e95..83b4f0aa6ce56a8c816f005d23bf4374b1d65e18 100644 (file)
@@ -888,6 +888,9 @@ static void clip_main_region_draw(const bContext *C, ARegion *ar)
        /* data... */
        movieclip_main_area_set_view2d(C, ar);
 
+       /* callback */
+       ED_region_draw_cb_draw(C, ar, REGION_DRAW_PRE_VIEW);
+
        clip_draw_main(C, sc, ar);
 
        /* TODO(sergey): would be nice to find a way to de-duplicate all this space conversions */
@@ -933,6 +936,9 @@ static void clip_main_region_draw(const bContext *C, ARegion *ar)
                clip_draw_grease_pencil((bContext *)C, true);
        }
 
+       /* callback */
+       ED_region_draw_cb_draw(C, ar, REGION_DRAW_POST_VIEW);
+
        /* reset view matrix */
        UI_view2d_view_restore(C);