X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcwindowgui.C;h=0ee1d6751906ec6a4992c6feaf4c90ade928c9a5;hb=9fed7535470aa37781733db836068da3b4c17a0d;hp=3e9bf9ecd8e150fad157a3354ac8f3e90f0d48ec;hpb=7ead9f7382846e81c2f8efb25780014e5f8834c3;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/cinelerra/cwindowgui.C b/cinelerra-5.1/cinelerra/cwindowgui.C index 3e9bf9ec..0ee1d675 100644 --- a/cinelerra-5.1/cinelerra/cwindowgui.C +++ b/cinelerra-5.1/cinelerra/cwindowgui.C @@ -1129,14 +1129,6 @@ void CWindowCanvas::draw_refresh(int flush) BC_WindowBase *window = get_canvas(); if( window && !window->get_video_on() ) { clear(0); - if( mwindow->uses_opengl() ) { -// this code is to idle rendering before drawing overlays on refresh frame -// if this is not done, occationally opengl finishs late, and overwrites -// the x11 refresh frame and the overlay is not visible. Rarely happens. - unlock_canvas(); - mwindow->playback_3d->finish_output(this); - lock_canvas("CWindowCanvas::draw_refresh"); - } if( refresh_frame && refresh_frame->get_w()>0 && refresh_frame->get_h()>0 ) { float in_x1, in_y1, in_x2, in_y2; float out_x1, out_y1, out_x2, out_y2; @@ -1757,8 +1749,7 @@ int CWindowCanvas::do_mask(int &redraw, int &rerender, if( draw_boundary ) { char mask_label[BCSTRLEN]; int k = mwindow->edl->session->cwindow_mask; - if( !prev_mask || prev_mask->is_default || - k < 0 || k >= prev_mask->masks.size() ) + if( !prev_mask || k < 0 || k >= prev_mask->masks.size() ) sprintf(mask_label, "%d", k); else sprintf(mask_label, "%s", prev_mask->masks[k]->name);