Merge branch 'master' into blender2.8
This commit is contained in:
commit
da344b4045
@ -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);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user