X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcwindowtool.C;h=f3fda9a4a85b47564b9de9c09028549fbaa611f0;hb=0e00daab15d8b871ec7f76c2713b75d5f3fb237d;hp=bfb7856018b76733d106af2a97a94c491752f964;hpb=667ff598ae2a94f48c7056aee1d77d7cde39066b;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/cwindowtool.C b/cinelerra-5.1/cinelerra/cwindowtool.C
index bfb78560..f3fda9a4 100644
--- a/cinelerra-5.1/cinelerra/cwindowtool.C
+++ b/cinelerra-5.1/cinelerra/cwindowtool.C
@@ -546,7 +546,7 @@ void CWindowEyedropGUI::update()
 	rgb_hex->update(rgb_text);
 	
 	float y, u, v;
-	YUV::rgb_to_yuv_f(r, g, b, y, u, v);
+	YUV::yuv.rgb_to_yuv_f(r, g, b, y, u, v);
 	this->y->update(y);
 	this->u->update(u);  u += 0.5;
 	this->v->update(v);  v += 0.5;
@@ -1662,6 +1662,9 @@ int CWindowMaskDelete::handle_event()
 		temp_keyframe.copy_data(keyframe);
 // Update parameter
 		SubMask *submask = temp_keyframe.get_submask(mwindow->edl->session->cwindow_mask);
+		if( shift_down() )
+			submask->points.remove_all_objects();
+
 		for(int i = mwindow->cwindow->gui->affected_point;
 			i < submask->points.total - 1;
 			i++)
@@ -1683,6 +1686,8 @@ int CWindowMaskDelete::handle_event()
 			current; )
 		{
 			SubMask *submask = current->get_submask(mwindow->edl->session->cwindow_mask);
+			if( shift_down() )
+				submask->points.remove_all_objects();
 
 			for(int i = mwindow->cwindow->gui->affected_point;
 				i < submask->points.total - 1;
@@ -2045,11 +2050,8 @@ int CWindowDisableOpenGLMasking::handle_event()
 
 
 CWindowMaskGUI::CWindowMaskGUI(MWindow *mwindow, CWindowTool *thread)
- : CWindowToolGUI(mwindow,
- 	thread,
-	_(PROGRAM_NAME ": Mask"),
-	330,
-	310)
+ : CWindowToolGUI(mwindow, thread,
+	_(PROGRAM_NAME ": Mask"), 330, 320)
 {
 	this->mwindow = mwindow;
 	this->thread = thread;
@@ -2117,6 +2119,8 @@ void CWindowMaskGUI::create_objects()
 	y += title->get_h() + margin;
 	add_subwindow(title = new BC_Title(x, y, _("Press Ctrl to move a control point")));
 	y += title->get_h() + margin;
+	add_subwindow(title = new BC_Title(x, y, _("Shift+click Delete to delete the mask")));
+	y += title->get_h() + margin;
 	add_subwindow(title = new BC_Title(x, y, _("Press Alt to translate the mask")));
 	y += 30;