From a4d52bd0fd180e2934ebed21a7d2aab84cc5b5a9 Mon Sep 17 00:00:00 2001 From: Matt Ebb Date: Sun, 13 Dec 2009 23:51:41 +0000 Subject: patch [#20342] Notifier patch for modifier rename and particle system rename by 'ThatHaze'. thanks! --- source/blender/editors/space_action/space_action.c | 18 ++++++++---------- source/blender/editors/space_buttons/space_buttons.c | 5 ++++- source/blender/editors/space_graph/space_graph.c | 11 ++++++----- source/blender/editors/space_logic/space_logic.c | 7 ++----- source/blender/editors/space_nla/space_nla.c | 15 +++++---------- source/blender/editors/space_node/space_node.c | 7 ++----- source/blender/editors/space_outliner/outliner.c | 2 +- source/blender/editors/space_outliner/space_outliner.c | 8 ++++++-- .../blender/editors/space_sequencer/space_sequencer.c | 14 ++++---------- source/blender/editors/space_view3d/space_view3d.c | 4 ++-- 10 files changed, 40 insertions(+), 51 deletions(-) (limited to 'source/blender/editors') diff --git a/source/blender/editors/space_action/space_action.c b/source/blender/editors/space_action/space_action.c index 0cbc2ce9078..08ed44a54f9 100644 --- a/source/blender/editors/space_action/space_action.c +++ b/source/blender/editors/space_action/space_action.c @@ -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: diff --git a/source/blender/editors/space_buttons/space_buttons.c b/source/blender/editors/space_buttons/space_buttons.c index f6b376f6e8e..160343cf940 100644 --- a/source/blender/editors/space_buttons/space_buttons.c +++ b/source/blender/editors/space_buttons/space_buttons.c @@ -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; } diff --git a/source/blender/editors/space_graph/space_graph.c b/source/blender/editors/space_graph/space_graph.c index d77caa4c0e3..3023ec89258 100644 --- a/source/blender/editors/space_graph/space_graph.c +++ b/source/blender/editors/space_graph/space_graph.c @@ -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) diff --git a/source/blender/editors/space_logic/space_logic.c b/source/blender/editors/space_logic/space_logic.c index ed8c7f2e4e7..c5b18d5b40e 100644 --- a/source/blender/editors/space_logic/space_logic.c +++ b/source/blender/editors/space_logic/space_logic.c @@ -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; } } diff --git a/source/blender/editors/space_nla/space_nla.c b/source/blender/editors/space_nla/space_nla.c index 8aceb647fe2..a799e265b72 100644 --- a/source/blender/editors/space_nla/space_nla.c +++ b/source/blender/editors/space_nla/space_nla.c @@ -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); diff --git a/source/blender/editors/space_node/space_node.c b/source/blender/editors/space_node/space_node.c index 64db1520ba1..dfdd4ea6657 100644 --- a/source/blender/editors/space_node/space_node.c +++ b/source/blender/editors/space_node/space_node.c @@ -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; } } diff --git a/source/blender/editors/space_outliner/outliner.c b/source/blender/editors/space_outliner/outliner.c index 750861ddace..f3485328c52 100644 --- a/source/blender/editors/space_outliner/outliner.c +++ b/source/blender/editors/space_outliner/outliner.c @@ -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) { diff --git a/source/blender/editors/space_outliner/space_outliner.c b/source/blender/editors/space_outliner/space_outliner.c index 31de6839468..469fe148b97 100644 --- a/source/blender/editors/space_outliner/space_outliner.c +++ b/source/blender/editors/space_outliner/space_outliner.c @@ -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; } } diff --git a/source/blender/editors/space_sequencer/space_sequencer.c b/source/blender/editors/space_sequencer/space_sequencer.c index 5be9fdee5a9..1e2fc1f59d3 100644 --- a/source/blender/editors/space_sequencer/space_sequencer.c +++ b/source/blender/editors/space_sequencer/space_sequencer.c @@ -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; } } diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c index bd277f68513..e65cb98e665 100644 --- a/source/blender/editors/space_view3d/space_view3d.c +++ b/source/blender/editors/space_view3d/space_view3d.c @@ -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; } -- cgit v1.2.3