[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47611] trunk/blender/source/blender: add listener in action space for mask changes so dopesheet redraws + other minor changes .
Campbell Barton
ideasman42 at gmail.com
Fri Jun 8 16:46:27 CEST 2012
Revision: 47611
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47611
Author: campbellbarton
Date: 2012-06-08 14:46:17 +0000 (Fri, 08 Jun 2012)
Log Message:
-----------
add listener in action space for mask changes so dopesheet redraws + other minor changes.
Modified Paths:
--------------
trunk/blender/source/blender/editors/include/ED_gpencil.h
trunk/blender/source/blender/editors/space_action/space_action.c
trunk/blender/source/blender/makesrna/intern/rna_mask.c
Modified: trunk/blender/source/blender/editors/include/ED_gpencil.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_gpencil.h 2012-06-08 14:31:38 UTC (rev 47610)
+++ trunk/blender/source/blender/editors/include/ED_gpencil.h 2012-06-08 14:46:17 UTC (rev 47611)
@@ -94,7 +94,7 @@
void borderselect_gplayer_frames(struct bGPDlayer *gpl, float min, float max, short select_mode);
void delete_gplayer_frames(struct bGPDlayer *gpl);
-void duplicate_gplayer_frames(struct bGPDlayer *gpd);
+void duplicate_gplayer_frames(struct bGPDlayer *gpl);
void free_gpcopybuf(void);
void copy_gpdata(void);
Modified: trunk/blender/source/blender/editors/space_action/space_action.c
===================================================================
--- trunk/blender/source/blender/editors/space_action/space_action.c 2012-06-08 14:31:38 UTC (rev 47610)
+++ trunk/blender/source/blender/editors/space_action/space_action.c 2012-06-08 14:46:17 UTC (rev 47611)
@@ -361,7 +361,7 @@
case NC_SCREEN:
if (wmn->data == ND_GPENCIL) {
/* only handle this event in GPencil mode for performance considerations */
- if (saction->mode == SACTCONT_GPENCIL)
+ if (saction->mode == SACTCONT_GPENCIL)
ED_area_tag_redraw(sa);
}
break;
@@ -405,6 +405,18 @@
break;
}
break;
+ case NC_MASK:
+ if (saction->mode == SACTCONT_MASK) {
+ switch (wmn->data) {
+ case ND_DATA:
+ ED_area_tag_refresh(sa);
+ break;
+ default: /* just redrawing the view will do */
+ ED_area_tag_redraw(sa);
+ break;
+ }
+ }
+ break;
case NC_NODE:
if (wmn->action == NA_SELECTED) {
/* selection changed, so force refresh to flush (needs flag set to do syncing) */
Modified: trunk/blender/source/blender/makesrna/intern/rna_mask.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_mask.c 2012-06-08 14:31:38 UTC (rev 47610)
+++ trunk/blender/source/blender/makesrna/intern/rna_mask.c 2012-06-08 14:46:17 UTC (rev 47611)
@@ -582,6 +582,12 @@
RNA_def_property_ui_icon(prop, ICON_RESTRICT_RENDER_OFF, 1);
RNA_def_property_update(prop, NC_MASK | NA_EDITED, NULL);
+ /* select (for dopesheet)*/
+ prop = RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE);
+ RNA_def_property_boolean_sdna(prop, NULL, "flag", MASK_LAYERFLAG_SELECT);
+ RNA_def_property_ui_text(prop, "Select", "Layer is selected for editing in the DopeSheet");
+// RNA_def_property_update(prop, NC_SCREEN | ND_MASK, NULL);
+
/* render settings */
prop = RNA_def_property(srna, "alpha", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "alpha");
More information about the Bf-blender-cvs
mailing list