[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25349] trunk/blender/source/blender: patch [#20342] Notifier patch for modifier rename and particle system rename

Matt Ebb matt at mke3.net
Mon Dec 14 00:51:41 CET 2009


Revision: 25349
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25349
Author:   broken
Date:     2009-12-14 00:51:41 +0100 (Mon, 14 Dec 2009)

Log Message:
-----------
patch [#20342] Notifier patch for modifier rename and particle system rename

by 'ThatHaze'. thanks!

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_action/space_action.c
    trunk/blender/source/blender/editors/space_buttons/space_buttons.c
    trunk/blender/source/blender/editors/space_graph/space_graph.c
    trunk/blender/source/blender/editors/space_logic/space_logic.c
    trunk/blender/source/blender/editors/space_nla/space_nla.c
    trunk/blender/source/blender/editors/space_node/space_node.c
    trunk/blender/source/blender/editors/space_outliner/outliner.c
    trunk/blender/source/blender/editors/space_outliner/space_outliner.c
    trunk/blender/source/blender/editors/space_sequencer/space_sequencer.c
    trunk/blender/source/blender/editors/space_view3d/space_view3d.c
    trunk/blender/source/blender/makesrna/intern/rna_ID.c
    trunk/blender/source/blender/makesrna/intern/rna_modifier.c
    trunk/blender/source/blender/makesrna/intern/rna_particle.c
    trunk/blender/source/blender/windowmanager/WM_types.h

Modified: trunk/blender/source/blender/editors/space_action/space_action.c
===================================================================
--- trunk/blender/source/blender/editors/space_action/space_action.c	2009-12-13 23:30:18 UTC (rev 25348)
+++ trunk/blender/source/blender/editors/space_action/space_action.c	2009-12-13 23:51:41 UTC (rev 25349)
@@ -289,14 +289,15 @@
 				case ND_KEYS:
 					ED_region_tag_redraw(ar);
 					break;
+				case ND_MODIFIER:
+					if(wmn->action == NA_RENAME)
+						ED_region_tag_redraw(ar);
+					break;
 			}
 			break;
 		case NC_ID:
-			switch(wmn->data) {
-				case ND_ID_RENAME:
-					ED_region_tag_redraw(ar);
-					break;
-			}
+			if(wmn->action == NA_RENAME)
+				ED_region_tag_redraw(ar);
 			break;
 		default:
 			if(wmn->data==ND_KEYS)
@@ -339,11 +340,8 @@
 			}
 			break;
 		case NC_ID:
-			switch(wmn->data) {
-				case ND_ID_RENAME:
-					ED_region_tag_redraw(ar);
-					break;
-			}
+			if(wmn->action == NA_RENAME)
+				ED_region_tag_redraw(ar);
 			break;
 				
 		default:

Modified: trunk/blender/source/blender/editors/space_buttons/space_buttons.c
===================================================================
--- trunk/blender/source/blender/editors/space_buttons/space_buttons.c	2009-12-13 23:30:18 UTC (rev 25348)
+++ trunk/blender/source/blender/editors/space_buttons/space_buttons.c	2009-12-13 23:51:41 UTC (rev 25349)
@@ -271,6 +271,9 @@
 				case ND_BONE_ACTIVE:
 				case ND_BONE_SELECT:
 				case ND_MODIFIER:
+					if(wmn->action == NA_RENAME)
+						ED_area_tag_redraw(sa);
+					break;
 				case ND_CONSTRAINT:
 					ED_area_tag_redraw(sa);
 					break;
@@ -311,7 +314,7 @@
 				ED_area_tag_redraw(sa);
 			break;
 		case NC_ID:
-			if(wmn->data == ND_ID_RENAME)
+			if(wmn->action == NA_RENAME)
 				ED_area_tag_redraw(sa);
 			break;
 	}

Modified: trunk/blender/source/blender/editors/space_graph/space_graph.c
===================================================================
--- trunk/blender/source/blender/editors/space_graph/space_graph.c	2009-12-13 23:30:18 UTC (rev 25348)
+++ trunk/blender/source/blender/editors/space_graph/space_graph.c	2009-12-13 23:51:41 UTC (rev 25349)
@@ -398,6 +398,10 @@
 				case ND_KEYS:
 					ED_region_tag_redraw(ar);
 					break;
+				case ND_MODIFIER:
+					if(wmn->action == NA_RENAME)
+						ED_region_tag_redraw(ar);
+					break;
 			}
 			break;
 		case NC_NODE:
@@ -408,11 +412,8 @@
 			}
 			break;
 		case NC_ID:
-			switch(wmn->data) {
-				case ND_ID_RENAME:
-					ED_region_tag_redraw(ar);
-					break;
-			}
+			if(wmn->action == NA_RENAME)
+				ED_region_tag_redraw(ar);
 			break;
 		default:
 			if(wmn->data==ND_KEYS)

Modified: trunk/blender/source/blender/editors/space_logic/space_logic.c
===================================================================
--- trunk/blender/source/blender/editors/space_logic/space_logic.c	2009-12-13 23:30:18 UTC (rev 25348)
+++ trunk/blender/source/blender/editors/space_logic/space_logic.c	2009-12-13 23:51:41 UTC (rev 25349)
@@ -218,11 +218,8 @@
 		case NC_OBJECT:
 			break;
 		case NC_ID:
-			switch(wmn->data) {
-				case ND_ID_RENAME:
-					ED_region_tag_redraw(ar);
-					break;
-			}
+			if(wmn->action == NA_RENAME)
+				ED_region_tag_redraw(ar);
 			break;
 	}
 }

Modified: trunk/blender/source/blender/editors/space_nla/space_nla.c
===================================================================
--- trunk/blender/source/blender/editors/space_nla/space_nla.c	2009-12-13 23:30:18 UTC (rev 25348)
+++ trunk/blender/source/blender/editors/space_nla/space_nla.c	2009-12-13 23:51:41 UTC (rev 25349)
@@ -423,11 +423,8 @@
 			}
 			break;
 		case NC_ID:
-			switch(wmn->data) {
-				case ND_ID_RENAME:
-					ED_region_tag_redraw(ar);
-					break;
-			}
+			if(wmn->action == NA_RENAME)
+				ED_region_tag_redraw(ar);
 			break;
 		default:
 			if(wmn->data==ND_KEYS)
@@ -459,12 +456,10 @@
 			}
 			break;
 		case NC_ID:
-			switch(wmn->data) {
-				case ND_ID_RENAME:
-					ED_region_tag_redraw(ar);
-					break;
-			}
+			if(wmn->action == NA_RENAME)
+				ED_region_tag_redraw(ar);
 			break;
+
 		default:
 			if(wmn->data==ND_KEYS)
 				ED_region_tag_redraw(ar);

Modified: trunk/blender/source/blender/editors/space_node/space_node.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/space_node.c	2009-12-13 23:30:18 UTC (rev 25348)
+++ trunk/blender/source/blender/editors/space_node/space_node.c	2009-12-13 23:51:41 UTC (rev 25349)
@@ -315,11 +315,8 @@
 			ED_region_tag_redraw(ar);
 			break;
 		case NC_ID:
-			switch(wmn->data) {
-				case ND_ID_RENAME:
-					ED_region_tag_redraw(ar);
-					break;
-			}
+			if(wmn->action == NA_RENAME)
+				ED_region_tag_redraw(ar);
 			break;
 	}
 }

Modified: trunk/blender/source/blender/editors/space_outliner/outliner.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner.c	2009-12-13 23:30:18 UTC (rev 25348)
+++ trunk/blender/source/blender/editors/space_outliner/outliner.c	2009-12-13 23:51:41 UTC (rev 25349)
@@ -4747,7 +4747,7 @@
 				case ID_SCE:
 					WM_event_add_notifier(C, NC_SCENE, NULL); break;
 				default:
-					WM_event_add_notifier(C, NC_ID|ND_ID_RENAME, NULL); break;
+					WM_event_add_notifier(C, NC_ID|NA_RENAME, NULL); break;
 			}					
 			/* Check the library target exists */
 			if (te->idcode == ID_LI) {

Modified: trunk/blender/source/blender/editors/space_outliner/space_outliner.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/space_outliner.c	2009-12-13 23:30:18 UTC (rev 25348)
+++ trunk/blender/source/blender/editors/space_outliner/space_outliner.c	2009-12-13 23:51:41 UTC (rev 25349)
@@ -133,6 +133,10 @@
 				case ND_TRANSFORM:
 					ED_region_tag_redraw(ar);
 					break;
+				case ND_MODIFIER:
+					if(wmn->action == NA_RENAME)
+						ED_region_tag_redraw(ar);
+					break;
 			}
 		case NC_GROUP:
 			/* all actions now, todo: check outliner view mode? */
@@ -148,9 +152,9 @@
 				ED_region_tag_redraw(ar);
 				break;
 		case NC_ID:
-			if(wmn->data == ND_ID_RENAME)
+			if(wmn->action == NA_RENAME)
 				ED_region_tag_redraw(ar);
-				break;
+			break;
 	}
 	
 }

Modified: trunk/blender/source/blender/editors/space_sequencer/space_sequencer.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/space_sequencer.c	2009-12-13 23:30:18 UTC (rev 25348)
+++ trunk/blender/source/blender/editors/space_sequencer/space_sequencer.c	2009-12-13 23:51:41 UTC (rev 25349)
@@ -242,11 +242,8 @@
 				ED_region_tag_redraw(ar);
 			break;
 		case NC_ID:
-			switch(wmn->data) {
-				case ND_ID_RENAME:
-					ED_region_tag_redraw(ar);
-					break;
-			}
+			if(wmn->action == NA_RENAME)
+				ED_region_tag_redraw(ar);
 			break;
 	}
 }
@@ -284,11 +281,8 @@
 				ED_region_tag_redraw(ar);
 			break;
 		case NC_ID:
-			switch(wmn->data) {
-				case ND_ID_RENAME:
-					ED_region_tag_redraw(ar);
-					break;
-			}
+			if(wmn->action == NA_RENAME)
+				ED_region_tag_redraw(ar);
 			break;
 	}
 }

Modified: trunk/blender/source/blender/editors/space_view3d/space_view3d.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/space_view3d.c	2009-12-13 23:30:18 UTC (rev 25348)
+++ trunk/blender/source/blender/editors/space_view3d/space_view3d.c	2009-12-13 23:51:41 UTC (rev 25349)
@@ -518,7 +518,7 @@
 				ED_region_tag_redraw(ar);
 			break;
 		case NC_ID:
-			if(wmn->data == ND_ID_RENAME)
+			if(wmn->action == NA_RENAME)
 				ED_region_tag_redraw(ar);
 			break;
 	}
@@ -644,7 +644,7 @@
 				ED_region_tag_redraw(ar);
 			break;
 		case NC_ID:
-			if(wmn->data == ND_ID_RENAME)
+			if(wmn->action == NA_RENAME)
 				ED_region_tag_redraw(ar);
 			break;
 	}

Modified: trunk/blender/source/blender/makesrna/intern/rna_ID.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_ID.c	2009-12-13 23:30:18 UTC (rev 25348)
+++ trunk/blender/source/blender/makesrna/intern/rna_ID.c	2009-12-13 23:51:41 UTC (rev 25349)
@@ -356,7 +356,7 @@
 	RNA_def_property_ui_text(prop, "Name", "Unique datablock ID name.");
 	RNA_def_property_string_funcs(prop, "rna_ID_name_get", "rna_ID_name_length", "rna_ID_name_set");
 	RNA_def_property_string_maxlength(prop, sizeof(((ID*)NULL)->name)-2);
-	RNA_def_property_update(prop, NC_ID|ND_ID_RENAME, NULL);
+	RNA_def_property_update(prop, NC_ID|NA_RENAME, NULL);
 	RNA_def_struct_name_property(srna, prop);
 
 	prop= RNA_def_property(srna, "users", PROP_INT, PROP_UNSIGNED);

Modified: trunk/blender/source/blender/makesrna/intern/rna_modifier.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_modifier.c	2009-12-13 23:30:18 UTC (rev 25348)
+++ trunk/blender/source/blender/makesrna/intern/rna_modifier.c	2009-12-13 23:51:41 UTC (rev 25349)
@@ -2016,6 +2016,7 @@
 	prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
 	RNA_def_property_string_funcs(prop, NULL, NULL, "rna_Modifier_name_set");
 	RNA_def_property_ui_text(prop, "Name", "Modifier name.");
+	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER|NA_RENAME, NULL);
 	RNA_def_struct_name_property(srna, prop);
 	
 	/* enums */

Modified: trunk/blender/source/blender/makesrna/intern/rna_particle.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_particle.c	2009-12-13 23:30:18 UTC (rev 25348)
+++ trunk/blender/source/blender/makesrna/intern/rna_particle.c	2009-12-13 23:51:41 UTC (rev 25349)
@@ -1904,6 +1904,7 @@
 
 	prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
 	RNA_def_property_ui_text(prop, "Name", "Particle system name.");
+	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER|NA_RENAME, NULL);
 	RNA_def_struct_name_property(srna, prop);
 
 	/* access to particle settings is redirected through functions */

Modified: trunk/blender/source/blender/windowmanager/WM_types.h
===================================================================
--- trunk/blender/source/blender/windowmanager/WM_types.h	2009-12-13 23:30:18 UTC (rev 25348)
+++ trunk/blender/source/blender/windowmanager/WM_types.h	2009-12-13 23:51:41 UTC (rev 25349)
@@ -218,10 +218,6 @@
 	/* NC_NODE Nodes */
 #define ND_NODE_SELECT			(1<<16)
 
-	/* NC_ID IDs */
-#define ND_ID_RENAME			(1<<16)
-
-
 	/* NC_SPACE */

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list