blender
/
blender
130
398
Fork 574
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

Fix wrong display of movie clip cache with mask overlay enabled

This commit is contained in:
Sergey Sharybin 2013-12-20 22:16:53 +06:00
parent 26aeb81d00
commit aec90a8faf
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/editors/space_clip/clip_draw.c
View File

@ -180,6 +180,7 @@ static void draw_movieclip_cache(SpaceClip *sc, ARegion *ar, MovieClip *clip, Sc
MovieTrackingReconstruction *reconstruction = BKE_tracking_get_active_reconstruction(tracking);
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
/* cache background */
glColor4ub(128, 128, 255, 64);
@ -1799,6 +1800,14 @@ void clip_draw_main(const bContext *C, SpaceClip *sc, ARegion *ar)
draw_movieclip_notes(sc, ar);
}
void clip_draw_cache_and_notes(const bContext *C, SpaceClip *sc, ARegion *ar)
{
Scene *scene = CTX_data_scene(C);
MovieClip *clip = ED_space_clip_get_clip(sc);
draw_movieclip_cache(sc, ar, clip, scene);
draw_movieclip_notes(sc, ar);
}
/* draw grease pencil */
void clip_draw_grease_pencil(bContext *C, int onlyv2d)
{

1
source/blender/editors/space_clip/clip_intern.h
View File

@ -73,6 +73,7 @@ void CLIP_OT_dopesheet_view_all(struct wmOperatorType *ot);
void clip_draw_main(const struct bContext *C, struct SpaceClip *sc, struct ARegion *ar);
void clip_draw_grease_pencil(struct bContext *C, int onlyv2d);
void clip_draw_curfra_label(const int framenr, const float x, const float y);
void clip_draw_cache_and_notes(const bContext *C, SpaceClip *sc, ARegion *ar);
/* clip_editor.c */
void clip_start_prefetch_job(const struct bContext *C);

2
source/blender/editors/space_clip/space_clip.c
View File

@ -1214,6 +1214,8 @@ static void clip_main_area_draw(const bContext *C, ARegion *ar)
glPopMatrix();
}
clip_draw_cache_and_notes(C, sc, ar);
if (sc->flag & SC_SHOW_GPENCIL) {
/* Grease Pencil */
clip_draw_grease_pencil((bContext *)C, true);