[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57668] trunk/blender: add missing notifiers for mask tools, some wouldn't refresh the compositor .

Campbell Barton ideasman42 at gmail.com
Sun Jun 23 17:48:00 CEST 2013


Revision: 57668
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57668
Author:   campbellbarton
Date:     2013-06-23 15:48:00 +0000 (Sun, 23 Jun 2013)
Log Message:
-----------
add missing notifiers for mask tools, some wouldn't refresh the compositor.

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/properties_mask_common.py
    trunk/blender/source/blender/editors/mask/mask_ops.c

Modified: trunk/blender/release/scripts/startup/bl_ui/properties_mask_common.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_mask_common.py	2013-06-23 15:37:08 UTC (rev 57667)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_mask_common.py	2013-06-23 15:48:00 UTC (rev 57668)
@@ -250,6 +250,7 @@
         col.operator("mask.delete")
         col.operator("mask.cyclic_toggle")
         col.operator("mask.switch_direction")
+        col.operator("mask.handle_type_set")
 
         col = layout.column(align=True)
         col.label(text="Parenting:")

Modified: trunk/blender/source/blender/editors/mask/mask_ops.c
===================================================================
--- trunk/blender/source/blender/editors/mask/mask_ops.c	2013-06-23 15:37:08 UTC (rev 57667)
+++ trunk/blender/source/blender/editors/mask/mask_ops.c	2013-06-23 15:48:00 UTC (rev 57668)
@@ -1074,6 +1074,7 @@
 		BKE_mask_update_display(mask, CFRA);
 
 		WM_event_add_notifier(C, NC_MASK | ND_SELECT, mask);
+		WM_event_add_notifier(C, NC_MASK | NA_EDITED, mask);
 
 		return OPERATOR_FINISHED;
 	}
@@ -1140,6 +1141,7 @@
 		BKE_mask_update_display(mask, CFRA);
 
 		WM_event_add_notifier(C, NC_MASK | ND_SELECT, mask);
+		WM_event_add_notifier(C, NC_MASK | NA_EDITED, mask);
 
 		return OPERATOR_FINISHED;
 	}
@@ -1172,6 +1174,8 @@
 	MaskLayer *masklay;
 	int handle_type = RNA_enum_get(op->ptr, "type");
 
+	bool change = false;
+
 	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
 		MaskSpline *spline;
 		int i;
@@ -1188,15 +1192,19 @@
 					BezTriple *bezt = &point->bezt;
 
 					bezt->h1 = bezt->h2 = handle_type;
+					change = true;
 				}
 			}
 		}
 	}
 
-	WM_event_add_notifier(C, NC_MASK | ND_DATA, mask);
-	DAG_id_tag_update(&mask->id, 0);
+	if (change) {
+		WM_event_add_notifier(C, NC_MASK | ND_DATA, mask);
+		DAG_id_tag_update(&mask->id, 0);
 
-	return OPERATOR_FINISHED;
+		return OPERATOR_FINISHED;
+	}
+	return OPERATOR_CANCELLED;
 }
 
 void MASK_OT_handle_type_set(wmOperatorType *ot)




More information about the Bf-blender-cvs mailing list