sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

patch [#20342] Notifier patch for modifier rename and particle system rename

Browse Source 
by 'ThatHaze'. thanks!
This commit is contained in:
Matt Ebb 2009-12-13 23:51:41 +00:00
parent 3f612b6ea5
commit a4d52bd0fd
14 changed files with 53 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/editors/space_action/space_action.c
View File

@ -289,14 +289,15 @@ static void action_channel_area_listener(ARegion *ar, wmNotifier *wmn)
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 @@ static void action_main_area_listener(ARegion *ar, wmNotifier *wmn)
}
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:

5
source/blender/editors/space_buttons/space_buttons.c
View File

@ -271,6 +271,9 @@ static void buttons_area_listener(ScrArea *sa, wmNotifier *wmn)
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 @@ static void buttons_area_listener(ScrArea *sa, wmNotifier *wmn)
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;
}

11
source/blender/editors/space_graph/space_graph.c
View File

@ -398,6 +398,10 @@ static void graph_region_listener(ARegion *ar, wmNotifier *wmn)
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 @@ static void graph_region_listener(ARegion *ar, wmNotifier *wmn)
}
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)

7
source/blender/editors/space_logic/space_logic.c
View File

@ -218,11 +218,8 @@ static void logic_listener(ARegion *ar, wmNotifier *wmn)
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;
}
}

15
source/blender/editors/space_nla/space_nla.c
View File

@ -423,11 +423,8 @@ static void nla_main_area_listener(ARegion *ar, wmNotifier *wmn)
}
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 @@ static void nla_channel_area_listener(ARegion *ar, wmNotifier *wmn)
}
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);

7
source/blender/editors/space_node/space_node.c
View File

@ -315,11 +315,8 @@ static void node_region_listener(ARegion *ar, wmNotifier *wmn)
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;
}
}

2
source/blender/editors/space_outliner/outliner.c
View File

@ -4747,7 +4747,7 @@ static void namebutton_cb(bContext *C, void *tsep, char *oldname)
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) {

8
source/blender/editors/space_outliner/space_outliner.c
View File

@ -133,6 +133,10 @@ static void outliner_main_area_listener(ARegion *ar, wmNotifier *wmn)
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 @@ static void outliner_main_area_listener(ARegion *ar, wmNotifier *wmn)
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;
}
}

14
source/blender/editors/space_sequencer/space_sequencer.c
View File

@ -242,11 +242,8 @@ static void sequencer_main_area_listener(ARegion *ar, wmNotifier *wmn)
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 @@ static void sequencer_buttons_area_listener(ARegion *ar, wmNotifier *wmn)
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;
}
}

4
source/blender/editors/space_view3d/space_view3d.c
View File

@ -518,7 +518,7 @@ static void view3d_main_area_listener(ARegion *ar, wmNotifier *wmn)
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 @@ static void view3d_buttons_area_listener(ARegion *ar, wmNotifier *wmn)
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;
}

2
source/blender/makesrna/intern/rna_ID.c
View File

@ -356,7 +356,7 @@ static void rna_def_ID(BlenderRNA *brna)
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);

1
source/blender/makesrna/intern/rna_modifier.c
View File

@ -2016,6 +2016,7 @@ void RNA_def_modifier(BlenderRNA *brna)
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 */

1
source/blender/makesrna/intern/rna_particle.c
View File

@ -1904,6 +1904,7 @@ static void rna_def_particle_system(BlenderRNA *brna)
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 */

24
source/blender/windowmanager/WM_types.h
View File

@ -218,10 +218,6 @@ typedef struct wmNotifier {
/* NC_NODE Nodes */
#define ND_NODE_SELECT (1<<16)
/* NC_ID IDs */
#define ND_ID_RENAME (1<<16)
/* NC_SPACE */
#define ND_SPACE_CONSOLE (1<<16) /* general redraw */
#define ND_SPACE_CONSOLE_REPORT (2<<16) /* update for reports, could specify type */
@ -245,17 +241,17 @@ typedef struct wmNotifier {
#define NOTE_SUBTYPE 0x0000FF00
/* subtype scene mode */
#define NS_MODE_OBJECT (1<<8)
#define NS_MODE_OBJECT (1<<8)
#define NS_EDITMODE_MESH (2<<8)
#define NS_EDITMODE_CURVE (3<<8)
#define NS_EDITMODE_SURFACE (4<<8)
#define NS_EDITMODE_TEXT (5<<8)
#define NS_EDITMODE_MBALL (6<<8)
#define NS_EDITMODE_LATTICE (7<<8)
#define NS_EDITMODE_MESH (2<<8)
#define NS_EDITMODE_CURVE (3<<8)
#define NS_EDITMODE_SURFACE (4<<8)
#define NS_EDITMODE_TEXT (5<<8)
#define NS_EDITMODE_MBALL (6<<8)
#define NS_EDITMODE_LATTICE (7<<8)
#define NS_EDITMODE_ARMATURE (8<<8)
#define NS_MODE_POSE (9<<8)
#define NS_MODE_PARTICLE (10<<8)
#define NS_MODE_POSE (9<<8)
#define NS_MODE_PARTICLE (10<<8)
/* action classification */
@ -264,7 +260,7 @@ typedef struct wmNotifier {
#define NA_EVALUATED 2
#define NA_ADDED 3
#define NA_REMOVED 4
#define NA_RENAME 5
/* ************** Gesture Manager data ************** */