Revision: 29537
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29537
Author: broken
Date: 2010-06-18 06:39:32 +0200 (Fri, 18 Jun 2010)
Log Message:
-----------
Notifier cleanup - replaced ND_*_EDIT and ND_*_SELECT data notifiers
with the generic action equivalents (NA_EDITED and new NA_SELECTED)
Modified Paths:
--------------
trunk/blender/source/blender/editors/animation/anim_channels_defines.c
trunk/blender/source/blender/editors/animation/anim_channels_edit.c
trunk/blender/source/blender/editors/animation/fmodifier_ui.c
trunk/blender/source/blender/editors/animation/keyframing.c
trunk/blender/source/blender/editors/animation/keyingsets.c
trunk/blender/source/blender/editors/armature/poselib.c
trunk/blender/source/blender/editors/interface/interface_anim.c
trunk/blender/source/blender/editors/physics/particle_edit.c
trunk/blender/source/blender/editors/space_action/action_edit.c
trunk/blender/source/blender/editors/space_action/action_select.c
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/graph_edit.c
trunk/blender/source/blender/editors/space_graph/graph_select.c
trunk/blender/source/blender/editors/space_graph/space_graph.c
trunk/blender/source/blender/editors/space_nla/nla_channels.c
trunk/blender/source/blender/editors/space_nla/nla_edit.c
trunk/blender/source/blender/editors/space_nla/nla_select.c
trunk/blender/source/blender/editors/space_node/node_select.c
trunk/blender/source/blender/editors/space_outliner/outliner.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_select.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/editors/transform/transform.c
trunk/blender/source/blender/makesrna/intern/rna_action.c
trunk/blender/source/blender/makesrna/intern/rna_boid.c
trunk/blender/source/blender/makesrna/intern/rna_fcurve.c
trunk/blender/source/blender/makesrna/intern/rna_particle.c
trunk/blender/source/blender/makesrna/intern/rna_sculpt_paint.c
trunk/blender/source/blender/makesrna/intern/rna_sequencer.c
trunk/blender/source/blender/makesrna/intern/rna_space.c
trunk/blender/source/blender/windowmanager/WM_types.h
Modified: trunk/blender/source/blender/editors/animation/anim_channels_defines.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_channels_defines.c
2010-06-18 03:28:27 UTC (rev 29536)
+++ trunk/blender/source/blender/editors/animation/anim_channels_defines.c
2010-06-18 04:39:32 UTC (rev 29537)
@@ -2858,7 +2858,7 @@
/* callback for (normal) widget settings - send notifiers */
static void achannel_setting_widget_cb(bContext *C, void *poin, void *poin2)
{
- WM_event_add_notifier(C, NC_ANIMATION|ND_ANIMCHAN_EDIT, NULL);
+ WM_event_add_notifier(C, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL);
}
/* callback for widget settings that need flushing */
@@ -2872,7 +2872,7 @@
short on = 0;
/* send notifiers before doing anything else... */
- WM_event_add_notifier(C, NC_ANIMATION|ND_ANIMCHAN_EDIT, NULL);
+ WM_event_add_notifier(C, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL);
/* verify animation context */
if (ANIM_animdata_get_context(C, &ac) == 0)
@@ -2936,7 +2936,7 @@
done= insert_keyframe_direct(ptr, prop, fcu, cfra, flag);
if (done)
- WM_event_add_notifier(C, NC_ANIMATION|ND_ANIMCHAN_EDIT,
NULL);
+ WM_event_add_notifier(C,
NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL);
}
}
@@ -2978,7 +2978,7 @@
done= insert_keyframe_direct(ptr, prop, fcu, cfra, flag);
if (done)
- WM_event_add_notifier(C, NC_ANIMATION|ND_ANIMCHAN_EDIT,
NULL);
+ WM_event_add_notifier(C,
NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL);
}
/* free the path */
Modified: trunk/blender/source/blender/editors/animation/anim_channels_edit.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_channels_edit.c
2010-06-18 03:28:27 UTC (rev 29536)
+++ trunk/blender/source/blender/editors/animation/anim_channels_edit.c
2010-06-18 04:39:32 UTC (rev 29537)
@@ -842,7 +842,7 @@
rearrange_action_channels(&ac, mode);
/* send notifier that things have changed */
- WM_event_add_notifier(C, NC_ANIMATION|ND_ANIMCHAN_EDIT, NULL);
+ WM_event_add_notifier(C, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL);
return OPERATOR_FINISHED;
}
@@ -998,7 +998,7 @@
}
/* send notifier that things have changed */
- WM_event_add_notifier(C, NC_ANIMATION|ND_ANIMCHAN_EDIT, NULL);
+ WM_event_add_notifier(C, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL);
return OPERATOR_FINISHED;
}
@@ -1075,7 +1075,7 @@
/* send notifier that things have changed */
- WM_event_add_notifier(C, NC_ANIMATION|ND_ANIMCHAN_EDIT, NULL);
+ WM_event_add_notifier(C, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL);
return OPERATOR_FINISHED;
}
@@ -1148,7 +1148,7 @@
BLI_freelistN(&all_data);
/* send notifier that things have changed */
- WM_event_add_notifier(C, NC_ANIMATION|ND_ANIMCHAN_EDIT, NULL);
+ WM_event_add_notifier(C, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL);
return OPERATOR_FINISHED;
}
@@ -1279,7 +1279,7 @@
setflag_anim_channels(&ac, setting, mode, 1, flush);
/* send notifier that things have changed */
- WM_event_add_notifier(C, NC_ANIMATION|ND_ANIMCHAN_EDIT, NULL);
+ WM_event_add_notifier(C, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL);
return OPERATOR_FINISHED;
}
@@ -1413,7 +1413,7 @@
setflag_anim_channels(&ac, ACHANNEL_SETTING_EXPAND,
ACHANNEL_SETFLAG_ADD, onlysel, 0);
/* send notifier that things have changed */
- WM_event_add_notifier(C, NC_ANIMATION|ND_ANIMCHAN_EDIT, NULL);
+ WM_event_add_notifier(C, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL);
return OPERATOR_FINISHED;
}
@@ -1455,7 +1455,7 @@
setflag_anim_channels(&ac, ACHANNEL_SETTING_EXPAND,
ACHANNEL_SETFLAG_CLEAR, onlysel, 0);
/* send notifier that things have changed */
- WM_event_add_notifier(C, NC_ANIMATION|ND_ANIMCHAN_EDIT, NULL);
+ WM_event_add_notifier(C, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL);
return OPERATOR_FINISHED;
}
@@ -1495,7 +1495,7 @@
ANIM_deselect_anim_channels(&ac, ac.data, ac.datatype, 1,
ACHANNEL_SETFLAG_ADD);
/* send notifier that things have changed */
- WM_event_add_notifier(C, NC_ANIMATION|ND_ANIMCHAN_SELECT, NULL);
+ WM_event_add_notifier(C, NC_ANIMATION|ND_ANIMCHAN|NA_SELECTED, NULL);
return OPERATOR_FINISHED;
}
@@ -1597,7 +1597,7 @@
borderselect_anim_channels(&ac, &rect, selectmode);
/* send notifier that things have changed */
- WM_event_add_notifier(C, NC_ANIMATION|ND_ANIMCHAN_SELECT, NULL);
+ WM_event_add_notifier(C, NC_ANIMATION|ND_ANIMCHAN|NA_SELECTED, NULL);
return OPERATOR_FINISHED;
}
@@ -1676,7 +1676,7 @@
if (adt) adt->flag |= ADT_UI_SELECTED;
}
- notifierFlags |= ND_ANIMCHAN_SELECT;
+ notifierFlags |= (ND_ANIMCHAN|NA_SELECTED);
}
break;
case ANIMTYPE_OBJECT:
@@ -1715,7 +1715,7 @@
if ((adt) && (adt->flag & ADT_UI_SELECTED))
adt->flag |= ADT_UI_ACTIVE;
- notifierFlags |= ND_ANIMCHAN_SELECT;
+ notifierFlags |= (ND_ANIMCHAN|NA_SELECTED);
}
break;
@@ -1751,7 +1751,7 @@
ale->adt->flag |= ADT_UI_ACTIVE;
}
- notifierFlags |= ND_ANIMCHAN_SELECT;
+ notifierFlags |= (ND_ANIMCHAN|NA_SELECTED);
}
break;
@@ -1786,7 +1786,7 @@
if (agrp->flag & AGRP_SELECTED)
ANIM_set_active_channel(ac, ac->data,
ac->datatype, filter, agrp, ANIMTYPE_GROUP);
- notifierFlags |= ND_ANIMCHAN_SELECT;
+ notifierFlags |= (ND_ANIMCHAN|NA_SELECTED);
}
break;
case ANIMTYPE_FCURVE:
@@ -1808,7 +1808,7 @@
if (fcu->flag & FCURVE_SELECTED)
ANIM_set_active_channel(ac, ac->data,
ac->datatype, filter, fcu, ANIMTYPE_FCURVE);
- notifierFlags |= ND_ANIMCHAN_SELECT;
+ notifierFlags |= (ND_ANIMCHAN|NA_SELECTED);
}
break;
case ANIMTYPE_SHAPEKEY:
@@ -1826,7 +1826,7 @@
kb->flag |= KEYBLOCK_SEL;
}
- notifierFlags |= ND_ANIMCHAN_SELECT;
+ notifierFlags |= (ND_ANIMCHAN|NA_SELECTED);
}
break;
case ANIMTYPE_GPDATABLOCK:
@@ -1836,7 +1836,7 @@
/* toggle expand */
gpd->flag ^= GP_DATA_EXPAND;
- notifierFlags |= ND_ANIMCHAN_EDIT;
+ notifierFlags |= (ND_ANIMCHAN|NA_EDITED);
}
break;
case ANIMTYPE_GPLAYER:
Modified: trunk/blender/source/blender/editors/animation/fmodifier_ui.c
===================================================================
--- trunk/blender/source/blender/editors/animation/fmodifier_ui.c
2010-06-18 03:28:27 UTC (rev 29536)
+++ trunk/blender/source/blender/editors/animation/fmodifier_ui.c
2010-06-18 04:39:32 UTC (rev 29537)
@@ -95,7 +95,7 @@
/* send notifiers */
// XXX for now, this is the only way to get updates in all the right
places... but would be nice to have a special one in this case
- WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+ WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
}
/* --------------- */
Modified: trunk/blender/source/blender/editors/animation/keyframing.c
===================================================================
--- trunk/blender/source/blender/editors/animation/keyframing.c 2010-06-18
03:28:27 UTC (rev 29536)
+++ trunk/blender/source/blender/editors/animation/keyframing.c 2010-06-18
04:39:32 UTC (rev 29537)
@@ -1094,7 +1094,7 @@
BKE_reportf(op->reports, RPT_INFO, "Successfully added
%d Keyframes for KeyingSet '%s'", success, ks->name);
/* send notifiers that keyframes have been changed */
- WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+ WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME|NA_EDITED,
NULL);
}
else
BKE_report(op->reports, RPT_WARNING, "Keying Set failed to
insert any keyframes");
@@ -1236,7 +1236,7 @@
BKE_reportf(op->reports, RPT_INFO, "Successfully
removed %d Keyframes for KeyingSet '%s'", success, ks->name);
/* send notifiers that keyframes have been changed */
- WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+ WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME|NA_EDITED,
NULL);
}
else
BKE_report(op->reports, RPT_WARNING, "Keying Set failed to
remove any keyframes");
@@ -1397,7 +1397,7 @@
DAG_ids_flush_update(0);
/* send notifiers that keyframes have been changed */
- WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+ WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME|NA_EDITED,
NULL);
}
return (success)? OPERATOR_FINISHED: OPERATOR_CANCELLED;
@@ -1467,7 +1467,7 @@
DAG_ids_flush_update(0);
/* send notifiers that keyframes have been changed */
- WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+ WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME|NA_EDITED,
NULL);
}
return (success)? OPERATOR_FINISHED: OPERATOR_CANCELLED;
Modified: trunk/blender/source/blender/editors/animation/keyingsets.c
===================================================================
--- trunk/blender/source/blender/editors/animation/keyingsets.c 2010-06-18
03:28:27 UTC (rev 29536)
+++ trunk/blender/source/blender/editors/animation/keyingsets.c 2010-06-18
04:39:32 UTC (rev 29537)
@@ -924,7 +924,7 @@
}
/* send notifiers for updates (this doesn't require
context to work!) */
- WM_main_add_notifier(NC_ANIMATION|ND_KEYFRAME_EDIT,
NULL);
+
WM_main_add_notifier(NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
}
}
Modified: trunk/blender/source/blender/editors/armature/poselib.c
===================================================================
--- trunk/blender/source/blender/editors/armature/poselib.c 2010-06-18
03:28:27 UTC (rev 29536)
+++ trunk/blender/source/blender/editors/armature/poselib.c 2010-06-18
04:39:32 UTC (rev 29537)
@@ -806,7 +806,7 @@
}
/* send notifiers for this */
- WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+ WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
}
/* Apply the relevant changes to the pose */
Modified: trunk/blender/source/blender/editors/interface/interface_anim.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_anim.c
2010-06-18 03:28:27 UTC (rev 29536)
+++ trunk/blender/source/blender/editors/interface/interface_anim.c
2010-06-18 04:39:32 UTC (rev 29537)
@@ -111,7 +111,7 @@
fcu->flag &= ~FCURVE_SELECTED;
insert_keyframe(id, action,
((fcu->grp)?(fcu->grp->name):(NULL)), fcu->rna_path, fcu->array_index, cfra,
flag);
- WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME_EDIT,
NULL);
+ WM_event_add_notifier(C,
NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
}
}
}
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
