Notifier cleanup - replaced ND_*_EDIT and ND_*_SELECT data notifiers
authorMatt Ebb <matt@mke3.net>
Fri, 18 Jun 2010 04:39:32 +0000 (04:39 +0000)
committerMatt Ebb <matt@mke3.net>
Fri, 18 Jun 2010 04:39:32 +0000 (04:39 +0000)
with the generic action equivalents (NA_EDITED and new NA_SELECTED)

32 files changed:
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/animation/fmodifier_ui.c
source/blender/editors/animation/keyframing.c
source/blender/editors/animation/keyingsets.c
source/blender/editors/armature/poselib.c
source/blender/editors/interface/interface_anim.c
source/blender/editors/physics/particle_edit.c
source/blender/editors/space_action/action_edit.c
source/blender/editors/space_action/action_select.c
source/blender/editors/space_action/space_action.c
source/blender/editors/space_buttons/space_buttons.c
source/blender/editors/space_graph/graph_edit.c
source/blender/editors/space_graph/graph_select.c
source/blender/editors/space_graph/space_graph.c
source/blender/editors/space_nla/nla_channels.c
source/blender/editors/space_nla/nla_edit.c
source/blender/editors/space_nla/nla_select.c
source/blender/editors/space_node/node_select.c
source/blender/editors/space_outliner/outliner.c
source/blender/editors/space_sequencer/sequencer_select.c
source/blender/editors/space_sequencer/space_sequencer.c
source/blender/editors/space_view3d/space_view3d.c
source/blender/editors/transform/transform.c
source/blender/makesrna/intern/rna_action.c
source/blender/makesrna/intern/rna_boid.c
source/blender/makesrna/intern/rna_fcurve.c
source/blender/makesrna/intern/rna_particle.c
source/blender/makesrna/intern/rna_sculpt_paint.c
source/blender/makesrna/intern/rna_sequencer.c
source/blender/makesrna/intern/rna_space.c
source/blender/windowmanager/WM_types.h

index 3f00c1a..fee6638 100644 (file)
@@ -2858,7 +2858,7 @@ void ANIM_channel_draw (bAnimContext *ac, bAnimListElem *ale, float yminc, float
 /* 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 @@ static void achannel_setting_flush_widget_cb(bContext *C, void *ale_npoin, void
        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 @@ static void achannel_setting_slider_cb(bContext *C, void *id_poin, void *fcu_poi
                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 @@ static void achannel_setting_slider_shapekey_cb(bContext *C, void *key_poin, voi
                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 */
index bdaf0bf..21bdb59 100644 (file)
@@ -842,7 +842,7 @@ static int animchannels_rearrange_exec(bContext *C, wmOperator *op)
        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 @@ static int animchannels_delete_exec(bContext *C, wmOperator *op)
        }
        
        /* 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 @@ static int animchannels_visibility_set_exec(bContext *C, wmOperator *op)
        
        
        /* 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 @@ static int animchannels_visibility_toggle_exec(bContext *C, wmOperator *op)
        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 @@ static int animchannels_setflag_exec(bContext *C, wmOperator *op)
        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 @@ static int animchannels_expand_exec (bContext *C, wmOperator *op)
        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 @@ static int animchannels_collapse_exec (bContext *C, wmOperator *op)
        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 @@ static int animchannels_deselectall_exec(bContext *C, wmOperator *op)
                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 @@ static int animchannels_borderselect_exec(bContext *C, wmOperator *op)
        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 @@ static int mouse_anim_channels (bAnimContext *ac, float x, int channel_index, sh
                                if (adt) adt->flag |= ADT_UI_SELECTED;
                        }
                        
-                       notifierFlags |= ND_ANIMCHAN_SELECT;
+                       notifierFlags |= (ND_ANIMCHAN|NA_SELECTED);
                }
                        break;
                case ANIMTYPE_OBJECT:
@@ -1715,7 +1715,7 @@ static int mouse_anim_channels (bAnimContext *ac, float x, int channel_index, sh
                        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 @@ static int mouse_anim_channels (bAnimContext *ac, float x, int channel_index, sh
                                        ale->adt->flag |= ADT_UI_ACTIVE;
                        }
                        
-                       notifierFlags |= ND_ANIMCHAN_SELECT;
+                       notifierFlags |= (ND_ANIMCHAN|NA_SELECTED);
                }       
                        break;
                
@@ -1786,7 +1786,7 @@ static int mouse_anim_channels (bAnimContext *ac, float x, int channel_index, sh
                        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 @@ static int mouse_anim_channels (bAnimContext *ac, float x, int channel_index, sh
                        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 @@ static int mouse_anim_channels (bAnimContext *ac, float x, int channel_index, sh
                                kb->flag |= KEYBLOCK_SEL;
                        }
                                
-                       notifierFlags |= ND_ANIMCHAN_SELECT;
+                       notifierFlags |= (ND_ANIMCHAN|NA_SELECTED);
                }
                        break;
                case ANIMTYPE_GPDATABLOCK:
@@ -1836,7 +1836,7 @@ static int mouse_anim_channels (bAnimContext *ac, float x, int channel_index, sh
                        /* toggle expand */
                        gpd->flag ^= GP_DATA_EXPAND;
                        
-                       notifierFlags |= ND_ANIMCHAN_EDIT;
+                       notifierFlags |= (ND_ANIMCHAN|NA_EDITED);
                }
                        break;
                case ANIMTYPE_GPLAYER:
index 3bd8b50..cd6714e 100644 (file)
@@ -95,7 +95,7 @@ static void delete_fmodifier_cb (bContext *C, void *fmods_v, void *fcm_v)
        
        /* 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);
 }
 
 /* --------------- */
index 5089d58..882fb3e 100644 (file)
@@ -1094,7 +1094,7 @@ static int insert_key_exec (bContext *C, wmOperator *op)
                        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 @@ static int delete_key_exec (bContext *C, wmOperator *op)
                        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 @@ static int insert_key_button_exec (bContext *C, wmOperator *op)
                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 @@ static int delete_key_button_exec (bContext *C, wmOperator *op)
                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;
index 49b8c11..f496cec 100644 (file)
@@ -924,7 +924,7 @@ int ANIM_apply_keyingset (bContext *C, ListBase *dsources, bAction *act, KeyingS
                        }
                        
                        /* 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);
                }
        }
        
index 613a3bd..408a2e1 100644 (file)
@@ -806,7 +806,7 @@ static void poselib_keytag_pose (bContext *C, Scene *scene, tPoseLib_PreviewData
        }
        
        /* 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 */
index 207230a..4108e1c 100644 (file)
@@ -111,7 +111,7 @@ void ui_but_anim_autokey(bContext *C, uiBut *but, Scene *scene, float cfra)
                        
                        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);
                }
        }
 }
index 541b0cf..5ef805e 100644 (file)
@@ -1321,7 +1321,7 @@ static int select_all_exec(bContext *C, wmOperator *op)
        }
 
        PE_update_selection(scene, ob, 1);
-       WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_SELECT, ob);
+       WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_SELECTED, ob);
 
        return OPERATOR_FINISHED;
 }
@@ -1371,7 +1371,7 @@ int PE_mouse_particles(bContext *C, short *mval, int extend)
        for_mouse_hit_keys(&data, toggle_key_select, 1);  /* nearest only */
 
        PE_update_selection(scene, ob, 1);
-       WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_SELECT, data.ob);
+       WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_SELECTED, data.ob);
 
        return OPERATOR_FINISHED;
 }
@@ -1395,7 +1395,7 @@ static int select_roots_exec(bContext *C, wmOperator *op)
        foreach_point(&data, select_root);
 
        PE_update_selection(data.scene, data.ob, 1);
-       WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_SELECT, data.ob);
+       WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_SELECTED, data.ob);
 
        return OPERATOR_FINISHED;
 }
@@ -1435,7 +1435,7 @@ static int select_tips_exec(bContext *C, wmOperator *op)
        foreach_point(&data, select_tip);
 
        PE_update_selection(data.scene, data.ob, 1);
-       WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_SELECT, data.ob);
+       WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_SELECTED, data.ob);
 
        return OPERATOR_FINISHED;
 }
@@ -1475,7 +1475,7 @@ static int select_linked_exec(bContext *C, wmOperator *op)
 
        for_mouse_hit_keys(&data, select_keys, 1);  /* nearest only */
        PE_update_selection(data.scene, data.ob, 1);
-       WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_SELECT, data.ob);
+       WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_SELECTED, data.ob);
 
        return OPERATOR_FINISHED;
 }
@@ -1541,7 +1541,7 @@ int PE_border_select(bContext *C, rcti *rect, int select, int extend)
        for_mouse_hit_keys(&data, select_key, 0);
 
        PE_update_selection(scene, ob, 1);
-       WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_SELECT, ob);
+       WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_SELECTED, ob);
 
        return OPERATOR_FINISHED;
 }
@@ -1566,7 +1566,7 @@ int PE_circle_select(bContext *C, int selecting, short *mval, float rad)
        for_mouse_hit_keys(&data, select_key, 0);
 
        PE_update_selection(scene, ob, 1);
-       WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_SELECT, ob);
+       WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_SELECTED, ob);
 
        return OPERATOR_FINISHED;
 }
@@ -1632,7 +1632,7 @@ int PE_lasso_select(bContext *C, short mcords[][2], short moves, short select)
        }
 
        PE_update_selection(scene, ob, 1);
-       WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_SELECT, ob);
+       WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_SELECTED, ob);
 
        return OPERATOR_FINISHED;
 }
@@ -1666,7 +1666,7 @@ static int hide_exec(bContext *C, wmOperator *op)
        }
 
        PE_update_selection(scene, ob, 1);
-       WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_SELECT, ob);
+       WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_SELECTED, ob);
 
        return OPERATOR_FINISHED;
 }
@@ -1708,7 +1708,7 @@ static int reveal_exec(bContext *C, wmOperator *op)
        }
 
        PE_update_selection(scene, ob, 1);
-       WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_SELECT, ob);
+       WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_SELECTED, ob);
 
        return OPERATOR_FINISHED;
 }
@@ -1766,7 +1766,7 @@ static int select_less_exec(bContext *C, wmOperator *op)
        foreach_point(&data, select_less_keys);
 
        PE_update_selection(data.scene, data.ob, 1);
-       WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_SELECT, data.ob);
+       WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_SELECTED, data.ob);
 
        return OPERATOR_FINISHED;
 }
@@ -1827,7 +1827,7 @@ static int select_more_exec(bContext *C, wmOperator *op)
        foreach_point(&data, select_more_keys);
 
        PE_update_selection(data.scene, data.ob, 1);
-       WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_SELECT, data.ob);
+       WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_SELECTED, data.ob);
 
        return OPERATOR_FINISHED;
 }
@@ -1864,7 +1864,7 @@ static int select_inverse_exec(bContext *C, wmOperator *op)
        }
 
        PE_update_selection(data.scene, data.ob, 1);
-       WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_SELECT, data.ob);
+       WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_SELECTED, data.ob);
 
        return OPERATOR_FINISHED;
 }
@@ -1955,7 +1955,7 @@ static int rekey_exec(bContext *C, wmOperator *op)
        
        recalc_lengths(data.edit);
        PE_update_object(data.scene, data.ob, 1);
-       WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_DATA, data.ob);
+       WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_EDITED, data.ob);
 
        return OPERATOR_FINISHED;
 }
@@ -2260,7 +2260,7 @@ static int subdivide_exec(bContext *C, wmOperator *op)
        
        recalc_lengths(data.edit);
        PE_update_object(data.scene, data.ob, 1);
-       WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_DATA, data.ob);
+       WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_EDITED, data.ob);
 
        return OPERATOR_FINISHED;
 }
@@ -2348,7 +2348,7 @@ static int remove_doubles_exec(bContext *C, wmOperator *op)
        BKE_reportf(op->reports, RPT_INFO, "Remove %d double particles.", totremoved);
 
        DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
-       WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_DATA, ob);
+       WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_EDITED, ob);
 
        return OPERATOR_FINISHED;
 }
@@ -2398,7 +2398,7 @@ static int weight_set_exec(bContext *C, wmOperator *op)
        }
 
        DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
-       WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_DATA, ob);
+       WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_EDITED, ob);
 
        return OPERATOR_FINISHED;
 }
@@ -2575,7 +2575,7 @@ static int delete_exec(bContext *C, wmOperator *op)
        }
 
        DAG_id_flush_update(&data.ob->id, OB_RECALC_DATA);
-       WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_DATA, data.ob);
+       WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_EDITED, data.ob);
 
        return OPERATOR_FINISHED;
 }
@@ -2734,7 +2734,7 @@ static int mirror_exec(bContext *C, wmOperator *op)
        PE_mirror_x(scene, ob, 0);
 
        update_world_cos(ob, edit);
-       WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_DATA, ob);
+       WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_EDITED, ob);
        DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 
        return OPERATOR_FINISHED;
@@ -3519,7 +3519,7 @@ static void brush_edit_apply(bContext *C, wmOperator *op, PointerRNA *itemptr)
                else
                        PE_update_object(scene, ob, 1);
 
-               WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_SELECT, ob);
+               WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_EDITED, ob);
                
                bedit->lastmouse[0]= mouse[0];
                bedit->lastmouse[1]= mouse[1];
@@ -4138,7 +4138,7 @@ static int clear_edited_exec(bContext *C, wmOperator *op)
                        psys->flag &= ~PSYS_EDITED;
 
                        psys_reset(psys, PSYS_RESET_DEPSGRAPH);
-                       WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_DATA, ob);
+                       WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_EDITED, ob);
                        DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
                }
        }
index b6e3327..01c8ede 100644 (file)
@@ -99,7 +99,7 @@ static int act_new_exec(bContext *C, wmOperator *op)
        }
 
        /* set notifier that keyframes have 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 OPERATOR_FINISHED;
 }
@@ -379,7 +379,7 @@ static int actkeys_paste_exec(bContext *C, wmOperator *op)
        ANIM_editkeyframes_refresh(&ac);
        
        /* set notifier that keyframes have 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 OPERATOR_FINISHED;
 }
@@ -474,7 +474,7 @@ static int actkeys_insertkey_exec(bContext *C, wmOperator *op)
        ANIM_editkeyframes_refresh(&ac);
        
        /* set notifier that keyframes have 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 OPERATOR_FINISHED;
 }
@@ -542,7 +542,7 @@ static int actkeys_duplicate_exec(bContext *C, wmOperator *op)
        ANIM_editkeyframes_refresh(&ac);
        
        /* set notifier that keyframes have 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 OPERATOR_FINISHED; // xxx - start transform
 }
@@ -629,7 +629,7 @@ static int actkeys_delete_exec(bContext *C, wmOperator *op)
        ANIM_editkeyframes_refresh(&ac);
        
        /* set notifier that keyframes have 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 OPERATOR_FINISHED;
 }
@@ -693,7 +693,7 @@ static int actkeys_clean_exec(bContext *C, wmOperator *op)
        ANIM_editkeyframes_refresh(&ac);
        
        /* set notifier that keyframes have 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 OPERATOR_FINISHED;
 }
@@ -757,7 +757,7 @@ static int actkeys_sample_exec(bContext *C, wmOperator *op)
        ANIM_editkeyframes_refresh(&ac);
        
        /* set notifier that keyframes have 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 OPERATOR_FINISHED;
 }
@@ -1238,7 +1238,7 @@ static int actkeys_snap_exec(bContext *C, wmOperator *op)
        ANIM_editkeyframes_refresh(&ac);
        
        /* set notifier that keyframes have 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 OPERATOR_FINISHED;
 }
@@ -1355,7 +1355,7 @@ static int actkeys_mirror_exec(bContext *C, wmOperator *op)
        ANIM_editkeyframes_refresh(&ac);
        
        /* set notifier that keyframes have 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 OPERATOR_FINISHED;
 }
index 33f918c..e852afa 100644 (file)
@@ -156,7 +156,7 @@ static int actkeys_deselectall_exec(bContext *C, wmOperator *op)
                deselect_action_keys(&ac, 1, SELECT_ADD);
        
        /* set notifier that keyframe selection have changed */
-       WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME_SELECT, NULL);
+       WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME|NA_SELECTED, NULL);
        
        return OPERATOR_FINISHED;
 }
@@ -317,7 +317,7 @@ static int actkeys_borderselect_exec(bContext *C, wmOperator *op)
        borderselect_action(&ac, rect, mode, selectmode);
        
        /* set notifier that keyframe selection have changed */
-       WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME_SELECT, NULL);
+       WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME|NA_SELECTED, NULL);
        
        return OPERATOR_FINISHED;
 } 
@@ -531,7 +531,7 @@ static int actkeys_columnselect_exec(bContext *C, wmOperator *op)
                columnselect_action_keys(&ac, mode);
        
        /* set notifier that keyframe selection have changed */
-       WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME_SELECT, NULL);
+       WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME|NA_SELECTED, NULL);
        
        return OPERATOR_FINISHED;
 }
@@ -589,7 +589,7 @@ static int actkeys_select_linked_exec (bContext *C, wmOperator *op)
        BLI_freelistN(&anim_data);
        
        /* set notifier that keyframe selection has changed */
-       WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME_SELECT, NULL);
+       WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME|NA_SELECTED, NULL);
        
        return OPERATOR_FINISHED;
 }
@@ -667,7 +667,7 @@ static int actkeys_select_more_exec (bContext *C, wmOperator *op)
        select_moreless_action_keys(&ac, SELMAP_MORE);
        
        /* set notifier that keyframe selection has changed */
-       WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME_SELECT, NULL);
+       WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME|NA_SELECTED, NULL);
        
        return OPERATOR_FINISHED;
 }
@@ -701,7 +701,7 @@ static int actkeys_select_less_exec (bContext *C, wmOperator *op)
        select_moreless_action_keys(&ac, SELMAP_LESS);
        
        /* set notifier that keyframe selection has changed */
-       WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME_SELECT, NULL);
+       WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME|NA_SELECTED, NULL);
        
        return OPERATOR_FINISHED;
 }
@@ -1138,7 +1138,7 @@ static int actkeys_clickselect_invoke(bContext *C, wmOperator *op, wmEvent *even
        }
        
        /* set notifier that keyframe selection (and channels too) have changed */
-       WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME_SELECT|ND_ANIMCHAN_SELECT, NULL);
+       WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME|ND_ANIMCHAN|NA_SELECTED, NULL);
        
        /* for tweak grab to work */
        return OPERATOR_FINISHED|OPERATOR_PASS_THROUGH;
index 41ae660..bad35d9 100644 (file)
@@ -352,7 +352,7 @@ static void action_listener(ScrArea *sa, wmNotifier *wmn)
        switch (wmn->category) {
                case NC_ANIMATION:
                        /* for selection changes of animation data, we can just redraw... otherwise autocolor might need to be done again */
-                       if (ELEM(wmn->data, ND_KEYFRAME_SELECT, ND_ANIMCHAN_SELECT))
+                       if (ELEM(wmn->data, ND_KEYFRAME, ND_ANIMCHAN) && (wmn->action == NA_SELECTED))
                                ED_area_tag_redraw(sa);
                        else
                                ED_area_tag_refresh(sa);
index 97cee5c..e28fcf8 100644 (file)
@@ -293,8 +293,9 @@ static void buttons_area_listener(ScrArea *sa, wmNotifier *wmn)
                                        buttons_area_redraw(sa, BCONTEXT_CONSTRAINT);
                                        buttons_area_redraw(sa, BCONTEXT_BONE_CONSTRAINT);
                                        break;
-                               case ND_PARTICLE_DATA:
-                                       buttons_area_redraw(sa, BCONTEXT_PARTICLE);
+                               case ND_PARTICLE:
+                                       if (wmn->action == NA_EDITED)
+                                               buttons_area_redraw(sa, BCONTEXT_PARTICLE);
                                        break;
                                case ND_DRAW:
                                        buttons_area_redraw(sa, BCONTEXT_OBJECT);
@@ -357,8 +358,9 @@ static void buttons_area_listener(ScrArea *sa, wmNotifier *wmn)
                        break;
                case NC_ANIMATION:
                        switch(wmn->data) {
-                               case ND_KEYFRAME_EDIT:
-                                       ED_area_tag_redraw(sa);
+                               case ND_KEYFRAME:
+                                       if (wmn->action == NA_EDITED)
+                                               ED_area_tag_redraw(sa);
                                        break;
                        }
        }
index eb4be32..6834dfa 100644 (file)
@@ -467,7 +467,7 @@ static int graphkeys_insertkey_exec(bContext *C, wmOperator *op)
        ANIM_editkeyframes_refresh(&ac);
        
        /* set notifier that keyframes have 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 OPERATOR_FINISHED;
 }
@@ -531,7 +531,7 @@ static int graphkeys_click_insert_exec (bContext *C, wmOperator *op)
        MEM_freeN(ale);
        
        /* set notifier that keyframes have changed */
-       WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+       WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
        
        /* done */
        return OPERATOR_FINISHED;
@@ -682,7 +682,7 @@ static int graphkeys_paste_exec(bContext *C, wmOperator *op)
        ANIM_editkeyframes_refresh(&ac);
        
        /* set notifier that keyframes have 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 OPERATOR_FINISHED;
 }
@@ -740,7 +740,7 @@ static int graphkeys_duplicate_exec(bContext *C, wmOperator *op)
        ANIM_editkeyframes_refresh(&ac);
        
        /* set notifier that keyframes have 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 OPERATOR_FINISHED;
 }
@@ -820,7 +820,7 @@ static int graphkeys_delete_exec(bContext *C, wmOperator *op)
        ANIM_editkeyframes_refresh(&ac);
        
        /* set notifier that keyframes have 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 OPERATOR_FINISHED;
 }
@@ -882,7 +882,7 @@ static int graphkeys_clean_exec(bContext *C, wmOperator *op)
        ANIM_editkeyframes_refresh(&ac);
        
        /* set notifier that keyframes have 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 OPERATOR_FINISHED;
 }
@@ -965,7 +965,7 @@ static int graphkeys_bake_exec(bContext *C, wmOperator *op)
        
        /* set notifier that keyframes have changed */
        // NOTE: some distinction between order/number of keyframes and type should be made?
-       WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+       WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
        
        return OPERATOR_FINISHED;
 }
@@ -1085,7 +1085,7 @@ static int graphkeys_sound_bake_exec(bContext *C, wmOperator *op)
        ANIM_editkeyframes_refresh(&ac);
 
        /* set notifier that 'keyframes' have 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 OPERATOR_FINISHED;
 }
@@ -1170,7 +1170,7 @@ static int graphkeys_sample_exec(bContext *C, wmOperator *op)
        ANIM_editkeyframes_refresh(&ac);
        
        /* set notifier that keyframes have 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 OPERATOR_FINISHED;
 }
@@ -1690,7 +1690,7 @@ static int graphkeys_snap_exec(bContext *C, wmOperator *op)
        ANIM_editkeyframes_refresh(&ac);
        
        /* set notifier that keyframes have 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 OPERATOR_FINISHED;
 }
@@ -1814,7 +1814,7 @@ static int graphkeys_mirror_exec(bContext *C, wmOperator *op)
        ANIM_editkeyframes_refresh(&ac);
        
        /* set notifier that keyframes have 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 OPERATOR_FINISHED;
 }
@@ -1869,7 +1869,7 @@ static int graphkeys_smooth_exec(bContext *C, wmOperator *op)
        ANIM_editkeyframes_refresh(&ac);
        
        /* set notifier that keyframes have 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 OPERATOR_FINISHED;
 }
@@ -2086,7 +2086,7 @@ static int graph_fmodifier_paste_exec(bContext *C, wmOperator *op)
                ANIM_editkeyframes_refresh(&ac);
                
                /* set notifier that keyframes have 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 OPERATOR_FINISHED;
        }
index 17b0a87..6a9d880 100644 (file)
@@ -160,7 +160,7 @@ static int graphkeys_deselectall_exec(bContext *C, wmOperator *op)
                deselect_graph_keys(&ac, 1, SELECT_ADD);
        
        /* set notifier that things have changed */
-       WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME_SELECT, NULL);
+       WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME|NA_SELECTED, NULL);
        
        return OPERATOR_FINISHED;
 }
@@ -329,7 +329,7 @@ static int graphkeys_borderselect_exec(bContext *C, wmOperator *op)
        borderselect_graphkeys(&ac, rect, mode, selectmode, incl_handles);
        
        /* send notifier that keyframe selection has changed */
-       WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME_SELECT, NULL);
+       WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME|NA_SELECTED, NULL);
        
        return OPERATOR_FINISHED;
 } 
@@ -520,7 +520,7 @@ static int graphkeys_columnselect_exec(bContext *C, wmOperator *op)
                columnselect_graph_keys(&ac, mode);
        
        /* set notifier that keyframe selection has changed */
-       WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME_SELECT, NULL);
+       WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME|NA_SELECTED, NULL);
        
        return OPERATOR_FINISHED;
 }
@@ -578,7 +578,7 @@ static int graphkeys_select_linked_exec (bContext *C, wmOperator *op)
        BLI_freelistN(&anim_data);
        
        /* set notifier that keyframe selection has changed */
-       WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME_SELECT, NULL);
+       WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME|NA_SELECTED, NULL);
        
        return OPERATOR_FINISHED;
 }
@@ -656,7 +656,7 @@ static int graphkeys_select_more_exec (bContext *C, wmOperator *op)
        select_moreless_graph_keys(&ac, SELMAP_MORE);
        
        /* set notifier that keyframe selection has changed */
-       WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME_SELECT, NULL);
+       WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME|NA_SELECTED, NULL);
        
        return OPERATOR_FINISHED;
 }
@@ -690,7 +690,7 @@ static int graphkeys_select_less_exec (bContext *C, wmOperator *op)
        select_moreless_graph_keys(&ac, SELMAP_LESS);
        
        /* set notifier that keyframe selection has changed */
-       WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME_SELECT, NULL);
+       WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME|NA_SELECTED, NULL);
        
        return OPERATOR_FINISHED;
 }
@@ -1260,7 +1260,7 @@ static int graphkeys_clickselect_invoke(bContext *C, wmOperator *op, wmEvent *ev
        }
        
        /* set notifier that keyframe selection (and also channel selection in some cases) has changed */
-       WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME_SELECT|ND_ANIMCHAN_SELECT, NULL);
+       WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME|ND_ANIMCHAN|NA_SELECTED, NULL);
        
        /* for tweak grab to work */
        return OPERATOR_FINISHED|OPERATOR_PASS_THROUGH;
index e7cee30..1e006ca 100644 (file)
@@ -382,9 +382,12 @@ static void graph_region_listener(ARegion *ar, wmNotifier *wmn)
                                case ND_OB_ACTIVE:
                                case ND_FRAME:
                                case ND_MARKERS:
-                               case ND_SEQUENCER_SELECT:
                                        ED_region_tag_redraw(ar);
                                        break;
+                               case ND_SEQUENCER:
+                                       if (wmn->action == NA_SELECTED)
+                                               ED_region_tag_redraw(ar);
+                                       break;
                        }
                        break;
                case NC_OBJECT:
@@ -401,13 +404,9 @@ static void graph_region_listener(ARegion *ar, wmNotifier *wmn)
                        }
                        break;
                case NC_NODE:
-                       switch(wmn->data) {
-                               case ND_NODE_SELECT:
-                                       ED_region_tag_redraw(ar);
-                                       break;
-                       }
                        switch(wmn->action) {
                                case NA_EDITED:
+                               case NA_SELECTED:
                                        ED_region_tag_redraw(ar);
                                        break;
                        }
@@ -432,7 +431,7 @@ static void graph_listener(ScrArea *sa, wmNotifier *wmn)
        switch (wmn->category) {
                case NC_ANIMATION:
                        /* for selection changes of animation data, we can just redraw... otherwise autocolor might need to be done again */
-                       if (ELEM(wmn->data, ND_KEYFRAME_SELECT, ND_ANIMCHAN_SELECT))
+                       if (ELEM(wmn->data, ND_KEYFRAME, ND_ANIMCHAN) && (wmn->action == NA_SELECTED))
                                ED_area_tag_redraw(sa);
                        else
                                ED_area_tag_refresh(sa);
index 4deab9d..cf98dec 100644 (file)
@@ -116,7 +116,7 @@ static int mouse_nla_channels (bAnimContext *ac, float x, int channel_index, sho
                                if (adt) adt->flag |= ADT_UI_SELECTED;
                        }
                        
-                       notifierFlags |= ND_ANIMCHAN_SELECT;
+                       notifierFlags |= (ND_ANIMCHAN|NA_SELECTED);
                }
                        break;
                case ANIMTYPE_OBJECT:
@@ -157,7 +157,7 @@ static int mouse_nla_channels (bAnimContext *ac, float x, int channel_index, sho
                                        adt->flag |= ADT_UI_ACTIVE;
                                
                                /* notifiers - channel was selected */
-                               notifierFlags |= ND_ANIMCHAN_SELECT;
+                               notifierFlags |= (ND_ANIMCHAN|NA_SELECTED);
                        }
                }
                        break;
@@ -194,7 +194,7 @@ static int mouse_nla_channels (bAnimContext *ac, float x, int channel_index, sho
                                        ale->adt->flag |= ADT_UI_ACTIVE;
                        }
                        
-                       notifierFlags |= ND_ANIMCHAN_SELECT;
+                       notifierFlags |= (ND_ANIMCHAN|NA_SELECTED);
                }       
                        break;
                        
@@ -220,21 +220,21 @@ static int mouse_nla_channels (bAnimContext *ac, float x, int channel_index, sho
                                nlt->flag ^= NLATRACK_PROTECTED;
                                
                                /* notifier flags - channel was edited */
-                               notifierFlags |= ND_ANIMCHAN_EDIT;
+                               notifierFlags |= (ND_ANIMCHAN|NA_EDITED);
                        }
                        else if (x >= (v2d->cur.xmax-2*NLACHANNEL_BUTTON_WIDTH)) {
                                /* toggle mute */
                                nlt->flag ^= NLATRACK_MUTED;
                                
                                /* notifier flags - channel was edited */
-                               notifierFlags |= ND_ANIMCHAN_EDIT;
+                               notifierFlags |= (ND_ANIMCHAN|NA_EDITED);
                        }
                        else if (x <= ((NLACHANNEL_BUTTON_WIDTH*2)+offset)) {
                                /* toggle 'solo' */
                                BKE_nlatrack_solo_toggle(adt, nlt);
                                
                                /* notifier flags - channel was edited */
-                               notifierFlags |= ND_ANIMCHAN_EDIT;
+                               notifierFlags |= (ND_ANIMCHAN|NA_EDITED);
                        }
                        else if (nlaedit_is_tweakmode_on(ac) == 0) {
                                /* set selection */
@@ -253,7 +253,7 @@ static int mouse_nla_channels (bAnimContext *ac, float x, int channel_index, sho
                                        ANIM_set_active_channel(ac, ac->data, ac->datatype, filter, nlt, ANIMTYPE_NLATRACK);
                                        
                                /* notifier flags - channel was selected */
-                               notifierFlags |= ND_ANIMCHAN_SELECT;
+                               notifierFlags |= (ND_ANIMCHAN|NA_SELECTED);
                        }
                }
                        break;
@@ -406,7 +406,7 @@ static int nlaedit_add_tracks_exec (bContext *C, wmOperator *op)
        BLI_freelistN(&anim_data);
        
        /* set notifier that things have changed */
-       WM_event_add_notifier(C, NC_ANIMATION|ND_NLA_EDIT, NULL);
+       WM_event_add_notifier(C, NC_ANIMATION|ND_NLA|NA_EDITED, NULL);
        
        /* done */
        return OPERATOR_FINISHED;
@@ -462,7 +462,7 @@ static int nlaedit_delete_tracks_exec (bContext *C, wmOperator *op)
        BLI_freelistN(&anim_data);
        
        /* set notifier that things have changed */
-       WM_event_add_notifier(C, NC_ANIMATION|ND_NLA_EDIT, NULL);
+       WM_event_add_notifier(C, NC_ANIMATION|ND_NLA|NA_EDITED, NULL);
        
        /* done */
        return OPERATOR_FINISHED;
index b017a61..38c6ecd 100644 (file)
@@ -311,7 +311,7 @@ static int nlaedit_add_actionclip_exec (bContext *C, wmOperator *op)
        ED_nla_postop_refresh(&ac);
        
        /* set notifier that things have changed */
-       WM_event_add_notifier(C, NC_ANIMATION|ND_NLA_EDIT, NULL);
+       WM_event_add_notifier(C, NC_ANIMATION|ND_NLA|NA_EDITED, NULL);
        
        /* done */
        return OPERATOR_FINISHED;
@@ -430,7 +430,7 @@ static int nlaedit_add_transition_exec (bContext *C, wmOperator *op)
                ED_nla_postop_refresh(&ac);
                
                /* set notifier that things have changed */
-               WM_event_add_notifier(C, NC_ANIMATION|ND_NLA_EDIT, NULL);
+               WM_event_add_notifier(C, NC_ANIMATION|ND_NLA|NA_EDITED, NULL);
                
                /* done */
                return OPERATOR_FINISHED;
@@ -497,7 +497,7 @@ static int nlaedit_add_meta_exec (bContext *C, wmOperator *op)
        BLI_freelistN(&anim_data);
        
        /* set notifier that things have changed */
-       WM_event_add_notifier(C, NC_ANIMATION|ND_NLA_EDIT, NULL);
+       WM_event_add_notifier(C, NC_ANIMATION|ND_NLA|NA_EDITED, NULL);
        
        /* done */
        return OPERATOR_FINISHED;
@@ -549,7 +549,7 @@ static int nlaedit_remove_meta_exec (bContext *C, wmOperator *op)
        BLI_freelistN(&anim_data);
        
        /* set notifier that things have changed */
-       WM_event_add_notifier(C, NC_ANIMATION|ND_NLA_EDIT, NULL);
+       WM_event_add_notifier(C, NC_ANIMATION|ND_NLA|NA_EDITED, NULL);
        
        /* done */
        return OPERATOR_FINISHED;
@@ -639,7 +639,7 @@ static int nlaedit_duplicate_exec (bContext *C, wmOperator *op)
                ED_nla_postop_refresh(&ac);
                
                /* set notifier that things have changed */
-               WM_event_add_notifier(C, NC_ANIMATION|ND_NLA_EDIT, NULL);
+               WM_event_add_notifier(C, NC_ANIMATION|ND_NLA|NA_EDITED, NULL);
                
                /* done */
                return OPERATOR_FINISHED;
@@ -727,7 +727,7 @@ static int nlaedit_delete_exec (bContext *C, wmOperator *op)
        ED_nla_postop_refresh(&ac);
        
        /* set notifier that things have changed */
-       WM_event_add_notifier(C, NC_ANIMATION|ND_NLA_EDIT, NULL);
+       WM_event_add_notifier(C, NC_ANIMATION|ND_NLA|NA_EDITED, NULL);
        
        /* done */
        return OPERATOR_FINISHED;
@@ -872,7 +872,7 @@ static int nlaedit_split_exec (bContext *C, wmOperator *op)
        ED_nla_postop_refresh(&ac);
        
        /* set notifier that things have changed */
-       WM_event_add_notifier(C, NC_ANIMATION|ND_NLA_EDIT, NULL);
+       WM_event_add_notifier(C, NC_ANIMATION|ND_NLA|NA_EDITED, NULL);
        
        /* done */
        return OPERATOR_FINISHED;
@@ -925,7 +925,7 @@ static int nlaedit_bake_exec (bContext *C, wmOperator *op)
        ED_nla_postop_refresh(&ac);
        
        /* set notifier that things have changed */
-       WM_event_add_notifier(C, NC_ANIMATION|ND_NLA_EDIT, NULL);
+       WM_event_add_notifier(C, NC_ANIMATION|ND_NLA|NA_EDITED, NULL);
        
        /* done */
        return OPERATOR_FINISHED;
@@ -987,7 +987,7 @@ static int nlaedit_toggle_mute_exec (bContext *C, wmOperator *op)
        BLI_freelistN(&anim_data);
        
        /* set notifier that things have changed */
-       WM_event_add_notifier(C, NC_ANIMATION|ND_NLA_EDIT, NULL);
+       WM_event_add_notifier(C, NC_ANIMATION|ND_NLA|NA_EDITED, NULL);
        
        /* done */
        return OPERATOR_FINISHED;
@@ -1061,7 +1061,7 @@ static int nlaedit_move_up_exec (bContext *C, wmOperator *op)
        ED_nla_postop_refresh(&ac);
        
        /* set notifier that things have changed */
-       WM_event_add_notifier(C, NC_ANIMATION|ND_NLA_EDIT, NULL);
+       WM_event_add_notifier(C, NC_ANIMATION|ND_NLA|NA_EDITED, NULL);
        
        /* done */
        return OPERATOR_FINISHED;
@@ -1135,7 +1135,7 @@ static int nlaedit_move_down_exec (bContext *C, wmOperator *op)
        ED_nla_postop_refresh(&ac);
        
        /* set notifier that things have changed */
-       WM_event_add_notifier(C, NC_ANIMATION|ND_NLA_EDIT, NULL);
+       WM_event_add_notifier(C, NC_ANIMATION|ND_NLA|NA_EDITED, NULL);
        
        /* done */
        return OPERATOR_FINISHED;
@@ -1211,7 +1211,7 @@ static int nlaedit_sync_actlen_exec (bContext *C, wmOperator *op)
        BLI_freelistN(&anim_data);
        
        /* set notifier that things have changed */
-       WM_event_add_notifier(C, NC_ANIMATION|ND_NLA_EDIT, NULL);
+       WM_event_add_notifier(C, NC_ANIMATION|ND_NLA|NA_EDITED, NULL);
        
        /* done */
        return OPERATOR_FINISHED;
@@ -1312,7 +1312,7 @@ static int nlaedit_apply_scale_exec (bContext *C, wmOperator *op)
        BLI_freelistN(&anim_data);
        
        /* set notifier that things have changed */
-       WM_event_add_notifier(C, NC_ANIMATION|ND_NLA_EDIT, NULL);
+       WM_event_add_notifier(C, NC_ANIMATION|ND_NLA|NA_EDITED, NULL);
        
        /* done */
        return OPERATOR_FINISHED;
@@ -1375,7 +1375,7 @@ static int nlaedit_clear_scale_exec (bContext *C, wmOperator *op)
        ED_nla_postop_refresh(&ac);
        
        /* set notifier that things have changed */
-       WM_event_add_notifier(C, NC_ANIMATION|ND_NLA_EDIT, NULL);
+       WM_event_add_notifier(C, NC_ANIMATION|ND_NLA|NA_EDITED, NULL);
        
        /* done */
        return OPERATOR_FINISHED;
@@ -1516,7 +1516,7 @@ static int nlaedit_snap_exec (bContext *C, wmOperator *op)
        ED_nla_postop_refresh(&ac);
        
        /* set notifier that things have changed */
-       WM_event_add_notifier(C, NC_ANIMATION|ND_NLA_EDIT, NULL);
+       WM_event_add_notifier(C, NC_ANIMATION|ND_NLA|NA_EDITED, NULL);
        
        /* done */
        return OPERATOR_FINISHED;
@@ -1631,7 +1631,7 @@ static int nla_fmodifier_add_exec(bContext *C, wmOperator *op)
        BLI_freelistN(&anim_data);
        
        /* set notifier that things have changed */
-       WM_event_add_notifier(C, NC_ANIMATION|ND_NLA_EDIT, NULL);
+       WM_event_add_notifier(C, NC_ANIMATION|ND_NLA|NA_EDITED, NULL);
        
        /* done */
        return OPERATOR_FINISHED;
@@ -1753,7 +1753,7 @@ static int nla_fmodifier_paste_exec(bContext *C, wmOperator *op)
        if (ok) {
                /* set notifier that things have changed */
                /* set notifier that things have changed */
-               WM_event_add_notifier(C, NC_ANIMATION|ND_NLA_EDIT, NULL);
+               WM_event_add_notifier(C, NC_ANIMATION|ND_NLA|NA_EDITED, NULL);
                return OPERATOR_FINISHED;
        }
        else {
index 1416e0a..5546358 100644 (file)
@@ -176,7 +176,7 @@ static int nlaedit_deselectall_exec(bContext *C, wmOperator *op)
                deselect_nla_strips(&ac, DESELECT_STRIPS_TEST, SELECT_ADD);
        
        /* set notifier that things have changed */
-       WM_event_add_notifier(C, NC_ANIMATION|ND_NLA_SELECT, NULL);
+       WM_event_add_notifier(C, NC_ANIMATION|ND_NLA|NA_SELECTED, NULL);
        
        return OPERATOR_FINISHED;
 }
@@ -313,7 +313,7 @@ static int nlaedit_borderselect_exec(bContext *C, wmOperator *op)
        borderselect_nla_strips(&ac, rect, mode, selectmode);
        
        /* set notifier that things have changed */
-       WM_event_add_notifier(C, NC_ANIMATION|ND_NLA_SELECT, NULL);
+       WM_event_add_notifier(C, NC_ANIMATION|ND_NLA|NA_SELECTED, NULL);
        
        return OPERATOR_FINISHED;
 } 
@@ -570,7 +570,7 @@ static int nlaedit_clickselect_invoke(bContext *C, wmOperator *op, wmEvent *even
        }
        
        /* set notifier that things have changed */
-       WM_event_add_notifier(C, NC_ANIMATION|ND_NLA_SELECT, NULL);
+       WM_event_add_notifier(C, NC_ANIMATION|ND_NLA|NA_SELECTED, NULL);
        
        /* for tweak grab to work */
        return OPERATOR_FINISHED|OPERATOR_PASS_THROUGH;
index 32e57e2..ccd1555 100644 (file)
@@ -120,7 +120,7 @@ static int node_select_exec(bContext *C, wmOperator *op)
        }
        
        /* send notifiers */
-       WM_event_add_notifier(C, NC_NODE|ND_NODE_SELECT, NULL);
+       WM_event_add_notifier(C, NC_NODE|NA_SELECTED, NULL);
        
        /* allow tweak event to work too */
        return OPERATOR_FINISHED|OPERATOR_PASS_THROUGH;
@@ -188,7 +188,7 @@ static int node_borderselect_exec(bContext *C, wmOperator *op)
                }
        }
        
-       WM_event_add_notifier(C, NC_NODE|ND_NODE_SELECT, NULL);
+       WM_event_add_notifier(C, NC_NODE|NA_SELECTED, NULL);
 
        return OPERATOR_FINISHED;
 }
@@ -264,7 +264,7 @@ static int node_select_all_exec(bContext *C, wmOperator *op)
                        node->flag |= NODE_SELECT;
        }
        
-       WM_event_add_notifier(C, NC_NODE|ND_NODE_SELECT, NULL);
+       WM_event_add_notifier(C, NC_NODE|NA_SELECTED, NULL);
        return OPERATOR_FINISHED;
 }
 
@@ -304,7 +304,7 @@ static int node_select_linked_to_exec(bContext *C, wmOperator *op)
                        node->flag |= NODE_SELECT;
        }
        
-       WM_event_add_notifier(C, NC_NODE|ND_NODE_SELECT, NULL);
+       WM_event_add_notifier(C, NC_NODE|NA_SELECTED, NULL);
        return OPERATOR_FINISHED;
 }
 
@@ -344,7 +344,7 @@ static int node_select_linked_from_exec(bContext *C, wmOperator *op)
                        node->flag |= NODE_SELECT;
        }
        
-       WM_event_add_notifier(C, NC_NODE|ND_NODE_SELECT, NULL);
+       WM_event_add_notifier(C, NC_NODE|NA_SELECTED, NULL);
        return OPERATOR_FINISHED;
 }
 
@@ -370,7 +370,7 @@ static int node_select_same_type_exec(bContext *C, wmOperator *op)
        SpaceNode *snode = CTX_wm_space_node(C);
 
        node_select_same_type(snode);
-       WM_event_add_notifier(C, NC_NODE|ND_NODE_SELECT, NULL);
+       WM_event_add_notifier(C, NC_NODE|NA_SELECTED, NULL);
        return OPERATOR_FINISHED;
 }
 
@@ -396,7 +396,7 @@ static int node_select_same_type_next_exec(bContext *C, wmOperator *op)
        SpaceNode *snode = CTX_wm_space_node(C);
 
        node_select_same_type_np(snode, 0);
-       WM_event_add_notifier(C, NC_NODE|ND_NODE_SELECT, NULL);
+       WM_event_add_notifier(C, NC_NODE|NA_SELECTED, NULL);
        return OPERATOR_FINISHED;
 }
 
@@ -420,7 +420,7 @@ static int node_select_same_type_prev_exec(bContext *C, wmOperator *op)
        SpaceNode *snode = CTX_wm_space_node(C);
 
        node_select_same_type_np(snode, 1);
-       WM_event_add_notifier(C, NC_NODE|ND_NODE_SELECT, NULL);
+       WM_event_add_notifier(C, NC_NODE|NA_SELECTED, NULL);
        return OPERATOR_FINISHED;
 }
 
index 37e05cb..aed8472 100644 (file)
@@ -2222,7 +2222,7 @@ static int tree_element_active_psys(bContext *C, Scene *scene, TreeElement *te,
        if(set) {
                Object *ob= (Object *)tselem->id;
                
-               WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_DATA, ob);
+               WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_EDITED, ob);
                
 // XXX         extern_set_butspace(F7KEY, 0);
        }
index 6681fa9..170b9fb 100644 (file)
@@ -239,7 +239,7 @@ static int sequencer_deselect_exec(bContext *C, wmOperator *op)
                }
        }
 
-       WM_event_add_notifier(C, NC_SCENE|ND_SEQUENCER_SELECT, scene);
+       WM_event_add_notifier(C, NC_SCENE|ND_SEQUENCER|NA_SELECTED, scene);
        
        return OPERATOR_FINISHED;
 }
@@ -277,7 +277,7 @@ static int sequencer_select_inverse_exec(bContext *C, wmOperator *op)
                }
        }
 
-       WM_event_add_notifier(C, NC_SCENE|ND_SEQUENCER_SELECT, scene);
+       WM_event_add_notifier(C, NC_SCENE|ND_SEQUENCER|NA_SELECTED, scene);
        
        return OPERATOR_FINISHED;
 }
@@ -505,7 +505,7 @@ static int sequencer_select_invoke(bContext *C, wmOperator *op, wmEvent *event)
        }
 #endif
        
-       WM_event_add_notifier(C, NC_SCENE|ND_SEQUENCER_SELECT, scene);
+       WM_event_add_notifier(C, NC_SCENE|ND_SEQUENCER|NA_SELECTED, scene);
 
        /* allowing tweaks */
        return OPERATOR_FINISHED|OPERATOR_PASS_THROUGH;
@@ -595,7 +595,7 @@ static int sequencer_select_more_exec(bContext *C, wmOperator *op)
        if(!select_more_less_seq__internal(scene, 0, 0))
                return OPERATOR_CANCELLED;
 
-       WM_event_add_notifier(C, NC_SCENE|ND_SEQUENCER_SELECT, scene);
+       WM_event_add_notifier(C, NC_SCENE|ND_SEQUENCER|NA_SELECTED, scene);
        
        return OPERATOR_FINISHED;
 }
@@ -626,7 +626,7 @@ static int sequencer_select_less_exec(bContext *C, wmOperator *op)
        if(!select_more_less_seq__internal(scene, 1, 0))
                return OPERATOR_CANCELLED;
  
-       WM_event_add_notifier(C, NC_SCENE|ND_SEQUENCER_SELECT, scene);
+       WM_event_add_notifier(C, NC_SCENE|ND_SEQUENCER|NA_SELECTED, scene);
        
        return OPERATOR_FINISHED;
 }
@@ -681,7 +681,7 @@ static int sequencer_select_linked_pick_invoke(bContext *C, wmOperator *op, wmEv
                selected = select_more_less_seq__internal(scene, 1, 1);
        }
        
-       WM_event_add_notifier(C, NC_SCENE|ND_SEQUENCER_SELECT, scene);
+       WM_event_add_notifier(C, NC_SCENE|ND_SEQUENCER|NA_SELECTED, scene);
        
        return OPERATOR_FINISHED;
 }
@@ -716,7 +716,7 @@ static int sequencer_select_linked_exec(bContext *C, wmOperator *op)
                selected = select_more_less_seq__internal(scene, 1, 1);
        }
 
-       WM_event_add_notifier(C, NC_SCENE|ND_SEQUENCER_SELECT, scene);
+       WM_event_add_notifier(C, NC_SCENE|ND_SEQUENCER|NA_SELECTED, scene);
 
        return OPERATOR_FINISHED;
 }
@@ -766,7 +766,7 @@ static int sequencer_select_handles_exec(bContext *C, wmOperator *op)
                }
        }
 
-       WM_event_add_notifier(C, NC_SCENE|ND_SEQUENCER_SELECT, scene);
+       WM_event_add_notifier(C, NC_SCENE|ND_SEQUENCER|NA_SELECTED, scene);
 
        return OPERATOR_FINISHED;
 }
@@ -803,7 +803,7 @@ static int sequencer_select_active_side_exec(bContext *C, wmOperator *op)
 
        select_active_side(ed->seqbasep, RNA_enum_get(op->ptr, "side"), seq_act->machine, seq_act->startdisp);
 
-       WM_event_add_notifier(C, NC_SCENE|ND_SEQUENCER_SELECT, scene);
+       WM_event_add_notifier(C, NC_SCENE|ND_SEQUENCER|NA_SELECTED, scene);
 
        return OPERATOR_FINISHED;
 }
@@ -865,7 +865,7 @@ static int sequencer_borderselect_exec(bContext *C, wmOperator *op)
                }
        }
 
-       WM_event_add_notifier(C, NC_SCENE|ND_SEQUENCER_SELECT, scene);
+       WM_event_add_notifier(C, NC_SCENE|ND_SEQUENCER|NA_SELECTED, scene);
 
        return OPERATOR_FINISHED;
 } 
index 81edb6e..49c2049 100644 (file)
@@ -357,7 +357,6 @@ static void sequencer_main_area_listener(ARegion *ar, wmNotifier *wmn)
                                case ND_FRAME:
                                case ND_MARKERS:
                                case ND_SEQUENCER:
-                               case ND_SEQUENCER_SELECT:
                                        ED_region_tag_redraw(ar);
                                        break;
                        }
@@ -408,7 +407,6 @@ static void sequencer_preview_area_listener(ARegion *ar, wmNotifier *wmn)
                                case ND_FRAME:
                                case ND_MARKERS:
                                case ND_SEQUENCER:
-                               case ND_SEQUENCER_SELECT:
                                        ED_region_tag_redraw(ar);
                                        break;
                        }
@@ -450,7 +448,6 @@ static void sequencer_buttons_area_listener(ARegion *ar, wmNotifier *wmn)
                switch(wmn->data) {
                        case ND_FRAME:
                        case ND_SEQUENCER:
-                       case ND_SEQUENCER_SELECT:
                                ED_region_tag_redraw(ar);
                                break;
                }
index 8d6b731..472379e 100644 (file)
@@ -523,13 +523,19 @@ static void view3d_main_area_listener(ARegion *ar, wmNotifier *wmn)
        switch(wmn->category) {
                case NC_ANIMATION:
                        switch(wmn->data) {
-                               case ND_KEYFRAME_EDIT:
                                case ND_KEYFRAME_PROP:
-                               case ND_NLA_EDIT:
                                case ND_NLA_ACTCHANGE:
-                               case ND_ANIMCHAN_SELECT:
                                        ED_region_tag_redraw(ar);
                                        break;
+                               case ND_NLA:
+                               case ND_KEYFRAME:
+                                       if (wmn->action == NA_EDITED)
+                                               ED_region_tag_redraw(ar);
+                                       break;
+                               case ND_ANIMCHAN:
+                                       if (wmn->action == NA_SELECTED)
+                                               ED_region_tag_redraw(ar);
+                                       break;
                        }
                        break;
                case NC_SCENE:
@@ -557,8 +563,7 @@ static void view3d_main_area_listener(ARegion *ar, wmNotifier *wmn)
                                case ND_MODIFIER:
                                case ND_CONSTRAINT:
                                case ND_KEYS:
-                               case ND_PARTICLE_SELECT:
-                               case ND_PARTICLE_DATA:
+                               case ND_PARTICLE:
                                        ED_region_tag_redraw(ar);
                                        break;
                        }
@@ -709,12 +714,15 @@ static void view3d_buttons_area_listener(ARegion *ar, wmNotifier *wmn)
        switch(wmn->category) {
                case NC_ANIMATION:
                        switch(wmn->data) {
-                               case ND_KEYFRAME_EDIT:
                                case ND_KEYFRAME_PROP:
-                               case ND_NLA_EDIT:
                                case ND_NLA_ACTCHANGE:
                                        ED_region_tag_redraw(ar);
                                        break;
+                               case ND_NLA:
+                               case ND_KEYFRAME:
+                                       if (wmn->action == NA_EDITED)
+                                               ED_region_tag_redraw(ar);
+                                       break;  
                        }
                        break;
                case NC_SCENE:
index 350683f..6532a94 100644 (file)
@@ -311,14 +311,14 @@ static void viewRedrawForce(const bContext *C, TransInfo *t)
        }
        else if (t->spacetype == SPACE_ACTION) {
                //SpaceAction *saction= (SpaceAction *)t->sa->spacedata.first;
-               WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+               WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
        }
        else if (t->spacetype == SPACE_IPO) {
                //SpaceIpo *sipo= (SpaceIpo *)t->sa->spacedata.first;
-               WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+               WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
        }
        else if (t->spacetype == SPACE_NLA) {
-               WM_event_add_notifier(C, NC_ANIMATION|ND_NLA_EDIT, NULL);
+               WM_event_add_notifier(C, NC_ANIMATION|ND_NLA|NA_EDITED, NULL);
        }
        else if(t->spacetype == SPACE_NODE)
        {
@@ -344,7 +344,7 @@ static void viewRedrawPost(TransInfo *t)
        if(t->spacetype == SPACE_VIEW3D) {
                /* if autokeying is enabled, send notifiers that keyframes were added */
                if (IS_AUTOKEY_ON(t->scene))
-                       WM_main_add_notifier(NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+                       WM_main_add_notifier(NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
        }
        
 #if 0 // TRANSFORM_FIX_ME
index 4f37195..bc83af7 100644 (file)
@@ -169,39 +169,39 @@ static void rna_def_dopesheet(BlenderRNA *brna)
        RNA_def_property_boolean_sdna(prop, NULL, "filterflag", ADS_FILTER_ONLYSEL);
        RNA_def_property_ui_text(prop, "Only Selected", "Only include channels relating to selected objects and data");
        RNA_def_property_ui_icon(prop, ICON_RESTRICT_SELECT_OFF, 0);
-       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL);
        
        /* Object Group Filtering Settings */
        prop= RNA_def_property(srna, "only_group_objects", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "filterflag", ADS_FILTER_ONLYOBGROUP);
        RNA_def_property_ui_text(prop, "Only Objects in Group", "Only include channels from Objects in the specified Group");
        RNA_def_property_ui_icon(prop, ICON_GROUP, 0);
-       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL);
        
        prop= RNA_def_property(srna, "filtering_group", PROP_POINTER, PROP_NONE);
        RNA_def_property_pointer_sdna(prop, NULL, "filter_grp");
        RNA_def_property_flag(prop, PROP_EDITABLE);
        RNA_def_property_ui_text(prop, "Filtering Group", "Group that included Object should be a member of");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL);
        
        /* NLA Specific Settings */
        prop= RNA_def_property(srna, "include_missing_nla", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NLA_NOACT);
        RNA_def_property_ui_text(prop, "Include Missing NLA", "Include Animation Data blocks with no NLA data. (NLA Editor only)");
        RNA_def_property_ui_icon(prop, ICON_ACTION, 0);
-       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL);
        
        /* Summary Settings (DopeSheet editors only) */
        prop= RNA_def_property(srna, "display_summary", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "filterflag", ADS_FILTER_SUMMARY);
        RNA_def_property_ui_text(prop, "Display Summary", "Display an additional 'summary' line. (DopeSheet Editors only)");
        RNA_def_property_ui_icon(prop, ICON_BORDERMOVE, 0);
-       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL);
        
        prop= RNA_def_property(srna, "collapse_summary", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "flag", ADS_FLAG_SUMMARY_COLLAPSED);
        RNA_def_property_ui_text(prop, "Collapse Summary", "Collapse summary when shown, so all other channels get hidden. (DopeSheet Editors Only)");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL);
        
        
        /* General DataType Filtering Settings */
@@ -209,85 +209,85 @@ static void rna_def_dopesheet(BlenderRNA *brna)
        RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOOBJ);
        RNA_def_property_ui_text(prop, "Display Transforms", "Include visualization of Object-level Animation data (mostly Transforms)");
        RNA_def_property_ui_icon(prop, ICON_MANIPUL, 0); // XXX?
-       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL);
        
        prop= RNA_def_property(srna, "display_shapekeys", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOSHAPEKEYS);
        RNA_def_property_ui_text(prop, "Display Shapekeys", "Include visualization of ShapeKey related Animation data");
        RNA_def_property_ui_icon(prop, ICON_SHAPEKEY_DATA, 0);
-       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL);
        
        prop= RNA_def_property(srna, "display_mesh", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOMESH);
        RNA_def_property_ui_text(prop, "Display Meshes", "Include visualization of Mesh related Animation data");
        RNA_def_property_ui_icon(prop, ICON_MESH_DATA, 0);
-       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL);
        
        prop= RNA_def_property(srna, "display_camera", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOCAM);
        RNA_def_property_ui_text(prop, "Display Camera", "Include visualization of Camera related Animation data");
        RNA_def_property_ui_icon(prop, ICON_CAMERA_DATA, 0);
-       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL);
        
        prop= RNA_def_property(srna, "display_material", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOMAT);
        RNA_def_property_ui_text(prop, "Display Material", "Include visualization of Material related Animation data");
        RNA_def_property_ui_icon(prop, ICON_MATERIAL_DATA, 0);
-       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL);
        
        prop= RNA_def_property(srna, "display_lamp", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOLAM);
        RNA_def_property_ui_text(prop, "Display Lamp", "Include visualization of Lamp related Animation data");
        RNA_def_property_ui_icon(prop, ICON_LAMP_DATA, 0);
-       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL);
        
        prop= RNA_def_property(srna, "display_texture", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOTEX);
        RNA_def_property_ui_text(prop, "Display Texture", "Include visualization of Texture related Animation data");
        RNA_def_property_ui_icon(prop, ICON_TEXTURE_DATA, 0);
-       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL);
        
        prop= RNA_def_property(srna, "display_curve", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOCUR);
        RNA_def_property_ui_text(prop, "Display Curve", "Include visualization of Curve related Animation data");
        RNA_def_property_ui_icon(prop, ICON_CURVE_DATA, 0);
-       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL);
        
        prop= RNA_def_property(srna, "display_world", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOWOR);
        RNA_def_property_ui_text(prop, "Display World", "Include visualization of World related Animation data");
        RNA_def_property_ui_icon(prop, ICON_WORLD_DATA, 0);
-       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL);
        
        prop= RNA_def_property(srna, "display_scene", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOSCE);
        RNA_def_property_ui_text(prop, "Display Scene", "Include visualization of Scene related Animation data");
        RNA_def_property_ui_icon(prop, ICON_SCENE_DATA, 0);
-       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL);
        
        prop= RNA_def_property(srna, "display_particle", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOPART);
        RNA_def_property_ui_text(prop, "Display Particle", "Include visualization of Particle related Animation data");
        RNA_def_property_ui_icon(prop, ICON_PARTICLE_DATA, 0);
-       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL);
        
        prop= RNA_def_property(srna, "display_metaball", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOMBA);
        RNA_def_property_ui_text(prop, "Display Metaball", "Include visualization of Metaball related Animation data");
        RNA_def_property_ui_icon(prop, ICON_META_DATA, 0);
-       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL);
        
        prop= RNA_def_property(srna, "display_armature", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOARM);
        RNA_def_property_ui_text(prop, "Display Armature", "Include visualization of Armature related Animation data");
        RNA_def_property_ui_icon(prop, ICON_ARMATURE_DATA, 0);
-       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL);
        
        prop= RNA_def_property(srna, "display_node", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NONTREE);
        RNA_def_property_ui_text(prop, "Display Node", "Include visualization of Node related Animation data");
        RNA_def_property_ui_icon(prop, ICON_NODETREE, 0);
-       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL);
 }
 
 static void rna_def_action_group(BlenderRNA *brna)
@@ -302,7 +302,7 @@ static void rna_def_action_group(BlenderRNA *brna)
        prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
        RNA_def_property_ui_text(prop, "Name", "");
        RNA_def_struct_name_property(srna, prop);
-       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL);
        
        /* WARNING: be very careful when working with this list, since the endpoint is not
         * defined like a standard ListBase. Adding/removing channels from this list needs
@@ -323,22 +323,22 @@ static void rna_def_action_group(BlenderRNA *brna)
        prop= RNA_def_property(srna, "selected", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "flag", AGRP_SELECTED);
        RNA_def_property_ui_text(prop, "Selected", "Action Group is selected");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN_SELECT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_SELECTED, NULL);
        
        prop= RNA_def_property(srna, "locked", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "flag", AGRP_PROTECTED);
        RNA_def_property_ui_text(prop, "Locked", "Action Group is locked");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL);
        
        prop= RNA_def_property(srna, "expanded", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "flag", AGRP_EXPANDED);
        RNA_def_property_ui_text(prop, "Expanded", "Action Group is expanded");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL);
        
        prop= RNA_def_property(srna, "custom_color", PROP_INT, PROP_NONE);
        RNA_def_property_int_sdna(prop, NULL, "customCol");
        RNA_def_property_ui_text(prop, "Custom Color", "Index of custom color set");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL);
 }
 
 /* fcurve.keyframe_points */
index 223d7a1..7e52032 100644 (file)
@@ -83,7 +83,7 @@ static void rna_Boids_reset(Main *bmain, Scene *scene, PointerRNA *ptr)
        else
                DAG_id_flush_update(ptr->id.data, OB_RECALC_DATA|PSYS_RECALC_RESET);
 
-       WM_main_add_notifier(NC_OBJECT|ND_PARTICLE_DATA, NULL);
+       WM_main_add_notifier(NC_OBJECT|ND_PARTICLE|NA_EDITED, NULL);
 }
 static void rna_Boids_reset_deps(Main *bmain, Scene *scene, PointerRNA *ptr)
 {
@@ -99,7 +99,7 @@ static void rna_Boids_reset_deps(Main *bmain, Scene *scene, PointerRNA *ptr)
 
        DAG_scene_sort(scene);
 
-       WM_main_add_notifier(NC_OBJECT|ND_PARTICLE_DATA, NULL);
+       WM_main_add_notifier(NC_OBJECT|ND_PARTICLE|NA_EDITED, NULL);
 }
 
 static StructRNA* rna_BoidRule_refine(struct PointerRNA *ptr)
index 10b9a5e..d798753 100644 (file)
@@ -571,20 +571,20 @@ static void rna_def_fmodifier_generator(BlenderRNA *brna)
        prop= RNA_def_property(srna, "additive", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "flag", FCM_GENERATOR_ADDITIVE);
        RNA_def_property_ui_text(prop, "Additive", "Values generated by this modifier are applied on top of the existing values instead of overwriting them");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
        
                // XXX this has a special validation func
        prop= RNA_def_property(srna, "mode", PROP_ENUM, PROP_NONE);
        RNA_def_property_enum_items(prop, generator_mode_items);
        RNA_def_property_ui_text(prop, "Mode", "Type of generator to use");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
        
        
        /* order of the polynomial */
                // XXX this has a special validation func
        prop= RNA_def_property(srna, "poly_order", PROP_INT, PROP_NONE);
        RNA_def_property_ui_text(prop, "Polynomial Order", "The highest power of 'x' for this polynomial. (number of coefficients - 1)");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
        
        /* coefficients array */
        prop= RNA_def_property(srna, "coefficients", PROP_FLOAT, PROP_NONE);
@@ -618,31 +618,31 @@ static void rna_def_fmodifier_function_generator(BlenderRNA *brna)
        /* coefficients */
        prop= RNA_def_property(srna, "amplitude", PROP_FLOAT, PROP_NONE);
        RNA_def_property_ui_text(prop, "Amplitude", "Scale factor determining the maximum/minimum values");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
        
        prop= RNA_def_property(srna, "phase_multiplier", PROP_FLOAT, PROP_NONE);
        RNA_def_property_ui_text(prop, "Phase Multiplier", "Scale factor determining the 'speed' of the function");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
        
        prop= RNA_def_property(srna, "phase_offset", PROP_FLOAT, PROP_NONE);
        RNA_def_property_ui_text(prop, "Phase Offset", "Constant factor to offset time by for function");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
        
        prop= RNA_def_property(srna, "value_offset", PROP_FLOAT, PROP_NONE);
        RNA_def_property_ui_text(prop, "Value Offset", "Constant factor to offset values by");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
        
        /* flags */
        prop= RNA_def_property(srna, "additive", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "flag", FCM_GENERATOR_ADDITIVE);
        RNA_def_property_ui_text(prop, "Additive", "Values generated by this modifier are applied on top of the existing values instead of overwriting them");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
        
        prop= RNA_def_property(srna, "function_type", PROP_ENUM, PROP_NONE);
        RNA_def_property_enum_sdna(prop, NULL, "type");
        RNA_def_property_enum_items(prop, prop_type_items);
        RNA_def_property_ui_text(prop, "Type", "Type of built-in function to use");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
 }
 
 /* --------- */
@@ -663,18 +663,18 @@ static void rna_def_fmodifier_envelope_ctrl(BlenderRNA *brna)
        prop= RNA_def_property(srna, "minimum", PROP_FLOAT, PROP_NONE);
        RNA_def_property_float_sdna(prop, NULL, "min");
        RNA_def_property_ui_text(prop, "Minimum Value", "Lower bound of envelope at this control-point");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
        
        prop= RNA_def_property(srna, "maximum", PROP_FLOAT, PROP_NONE);
        RNA_def_property_float_sdna(prop, NULL, "max");
        RNA_def_property_ui_text(prop, "Maximum Value", "Upper bound of envelope at this control-point");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
        
        /* Frame */
        prop= RNA_def_property(srna, "frame", PROP_FLOAT, PROP_TIME);
        RNA_def_property_float_sdna(prop, NULL, "time");
        RNA_def_property_ui_text(prop, "Frame", "Frame this control-point occurs on");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
        
        // TODO:
        //      - selection flags (not implemented in UI yet though)
@@ -699,17 +699,17 @@ static void rna_def_fmodifier_envelope(BlenderRNA *brna)
        prop= RNA_def_property(srna, "reference_value", PROP_FLOAT, PROP_NONE);
        RNA_def_property_float_sdna(prop, NULL, "midval");
        RNA_def_property_ui_text(prop, "Reference Value", "Value that envelope's influence is centered around / based on");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
        
        prop= RNA_def_property(srna, "default_minimum", PROP_FLOAT, PROP_NONE);
        RNA_def_property_float_sdna(prop, NULL, "min");
        RNA_def_property_ui_text(prop, "Default Minimum", "Lower distance from Reference Value for 1:1 default influence");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
        
        prop= RNA_def_property(srna, "default_maximum", PROP_FLOAT, PROP_NONE);
        RNA_def_property_float_sdna(prop, NULL, "max");
        RNA_def_property_ui_text(prop, "Default Maximum", "Upper distance from Reference Value for 1:1 default influence");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
 }
 
 /* --------- */
@@ -734,21 +734,21 @@ static void rna_def_fmodifier_cycles(BlenderRNA *brna)
        prop= RNA_def_property(srna, "before_mode", PROP_ENUM, PROP_NONE);
        RNA_def_property_enum_items(prop, prop_type_items);
        RNA_def_property_ui_text(prop, "Before Mode", "Cycling mode to use before first keyframe");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
        
        prop= RNA_def_property(srna, "before_cycles", PROP_FLOAT, PROP_NONE);
        RNA_def_property_ui_text(prop, "Before Cycles", "Maximum number of cycles to allow before first keyframe. (0 = infinite)");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
        
        /* after */
        prop= RNA_def_property(srna, "after_mode", PROP_ENUM, PROP_NONE);
        RNA_def_property_enum_items(prop, prop_type_items);
        RNA_def_property_ui_text(prop, "After Mode", "Cycling mode to use after last keyframe");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
        
        prop= RNA_def_property(srna, "after_cycles", PROP_FLOAT, PROP_NONE);
        RNA_def_property_ui_text(prop, "After Cycles", "Maximum number of cycles to allow after last keyframe. (0 = infinite)");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
 }
 
 /* --------- */
@@ -777,46 +777,46 @@ static void rna_def_fmodifier_limits(BlenderRNA *brna)
        prop= RNA_def_property(srna, "use_minimum_x", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "flag", FCM_LIMIT_XMIN);
        RNA_def_property_ui_text(prop, "Minimum X", "Use the minimum X value");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
        
        prop= RNA_def_property(srna, "use_minimum_y", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "flag", FCM_LIMIT_YMIN);
        RNA_def_property_ui_text(prop, "Minimum Y", "Use the minimum Y value");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
        
        prop= RNA_def_property(srna, "use_maximum_x", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "flag", FCM_LIMIT_XMAX);
        RNA_def_property_ui_text(prop, "Maximum X", "Use the maximum X value");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
        
        prop= RNA_def_property(srna, "use_maximum_y", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "flag", FCM_LIMIT_YMAX);
        RNA_def_property_ui_text(prop, "Maximum Y", "Use the maximum Y value");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
        
        prop= RNA_def_property(srna, "minimum_x", PROP_FLOAT, PROP_NONE);
        RNA_def_property_float_sdna(prop, NULL, "rect.xmin");
        RNA_def_property_float_funcs(prop, NULL, NULL, "rna_FModifierLimits_minx_range");
        RNA_def_property_ui_text(prop, "Minimum X", "Lowest X value to allow");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
        
        prop= RNA_def_property(srna, "minimum_y", PROP_FLOAT, PROP_NONE);
        RNA_def_property_float_sdna(prop, NULL, "rect.ymin");
        RNA_def_property_float_funcs(prop, NULL, NULL, "rna_FModifierLimits_miny_range");
        RNA_def_property_ui_text(prop, "Minimum Y", "Lowest Y value to allow");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
        
        prop= RNA_def_property(srna, "maximum_x", PROP_FLOAT, PROP_NONE);
        RNA_def_property_float_sdna(prop, NULL, "rect.xmax");
        RNA_def_property_float_funcs(prop, NULL, NULL, "rna_FModifierLimits_maxx_range");
        RNA_def_property_ui_text(prop, "Maximum X", "Highest X value to allow");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
        
        prop= RNA_def_property(srna, "maximum_y", PROP_FLOAT, PROP_NONE);
        RNA_def_property_float_sdna(prop, NULL, "rect.ymax");
        RNA_def_property_float_funcs(prop, NULL, NULL, "rna_FModifierLimits_maxy_range");
        RNA_def_property_ui_text(prop, "Maximum Y", "Highest Y value to allow");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
 }
 
 /* --------- */
@@ -840,27 +840,27 @@ static void rna_def_fmodifier_noise(BlenderRNA *brna)
        prop= RNA_def_property(srna, "modification", PROP_ENUM, PROP_NONE);
        RNA_def_property_enum_items(prop, prop_modification_items);
        RNA_def_property_ui_text(prop, "Modification", "Method of modifying the existing F-Curve");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
        
        prop= RNA_def_property(srna, "size", PROP_FLOAT, PROP_NONE);
        RNA_def_property_float_sdna(prop, NULL, "size");
        RNA_def_property_ui_text(prop, "Size", "Scaling (in time) of the noise");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
        
        prop= RNA_def_property(srna, "strength", PROP_FLOAT, PROP_NONE);
        RNA_def_property_float_sdna(prop, NULL, "strength");
        RNA_def_property_ui_text(prop, "Strength", "Amplitude of the noise - the amount that it modifies the underlying curve");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
        
        prop= RNA_def_property(srna, "phase", PROP_FLOAT, PROP_NONE);
        RNA_def_property_float_sdna(prop, NULL, "phase");
        RNA_def_property_ui_text(prop, "Phase", "A random seed for the noise effect");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
        
        prop= RNA_def_property(srna, "depth", PROP_INT, PROP_UNSIGNED);
        RNA_def_property_int_sdna(prop, NULL, "depth");
        RNA_def_property_ui_text(prop, "Depth", "Amount of fine level detail present in the noise");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
 
 }
 
@@ -878,34 +878,34 @@ static void rna_def_fmodifier_stepped(BlenderRNA *brna)
        /* properties */
        prop= RNA_def_property(srna, "step_size", PROP_FLOAT, PROP_NONE);
        RNA_def_property_ui_text(prop, "Step Size", "Number of frames to hold each value");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
        
        prop= RNA_def_property(srna, "offset", PROP_FLOAT, PROP_NONE);
        RNA_def_property_float_sdna(prop, NULL, "offset");
        RNA_def_property_ui_text(prop, "Offset", "Reference number of frames before frames get held. Use to get hold for '1-3' vs '5-7' holding patterns");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
        
        prop= RNA_def_property(srna, "use_frame_start", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "flag", FCM_STEPPED_NO_BEFORE);
        RNA_def_property_ui_text(prop, "Use Start Frame", "Restrict modifier to only act after its 'start' frame");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
        
        prop= RNA_def_property(srna, "use_frame_end", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "flag", FCM_STEPPED_NO_AFTER);
        RNA_def_property_ui_text(prop, "Use End Frame", "Restrict modifier to only act before its 'end' frame");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
        
        prop= RNA_def_property(srna, "frame_start", PROP_FLOAT, PROP_NONE);
        RNA_def_property_float_sdna(prop, NULL, "start_frame");
        RNA_def_property_float_funcs(prop, NULL, NULL, "rna_FModifierStepped_start_frame_range");
        RNA_def_property_ui_text(prop, "Start Frame", "Frame that modifier's influence starts (if applicable)");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
        
        prop= RNA_def_property(srna, "frame_end", PROP_FLOAT, PROP_NONE);
        RNA_def_property_float_sdna(prop, NULL, "end_frame");
        RNA_def_property_float_funcs(prop, NULL, NULL, "rna_FModifierStepped_end_frame_range");
        RNA_def_property_ui_text(prop, "End Frame", "Frame that modifier's influence ends (if applicable)");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
 }
 
 /* --------- */
@@ -1159,14 +1159,14 @@ static void rna_def_fpoint(BlenderRNA *brna)
        prop= RNA_def_property(srna, "selected", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "flag", 1);
        RNA_def_property_ui_text(prop, "Selected", "Selection status");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_SELECT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_SELECTED, NULL);
        
        /* Vector value */
        prop= RNA_def_property(srna, "co", PROP_FLOAT, PROP_XYZ);
        RNA_def_property_float_sdna(prop, NULL, "vec");
        RNA_def_property_array(prop, 2);
        RNA_def_property_ui_text(prop, "Point", "Point coordinates");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
 }
 
 
@@ -1186,17 +1186,17 @@ static void rna_def_fkeyframe(BlenderRNA *brna)
        prop= RNA_def_property(srna, "selected_handle1", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "f1", 0);
        RNA_def_property_ui_text(prop, "Handle 1 selected", "Handle 1 selection status");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_SELECT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_SELECTED, NULL);
        
        prop= RNA_def_property(srna, "selected_handle2", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "f3", 0);
        RNA_def_property_ui_text(prop, "Handle 2 selected", "Handle 2 selection status");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_SELECT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_SELECTED, NULL);
        
        prop= RNA_def_property(srna, "selected", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "f2", 0);
        RNA_def_property_ui_text(prop, "Selected", "Control point selection status");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_SELECT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_SELECTED, NULL);
        
        /* Enums */
        prop= RNA_def_property(srna, "handle1_type", PROP_ENUM, PROP_NONE);
@@ -1228,19 +1228,19 @@ static void rna_def_fkeyframe(BlenderRNA *brna)
        RNA_def_property_array(prop, 2);
        RNA_def_property_float_funcs(prop, "rna_FKeyframe_handle1_get", "rna_FKeyframe_handle1_set", NULL);
        RNA_def_property_ui_text(prop, "Handle 1", "Coordinates of the first handle");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
        
        prop= RNA_def_property(srna, "co", PROP_FLOAT, PROP_TRANSLATION);
        RNA_def_property_array(prop, 2);
        RNA_def_property_float_funcs(prop, "rna_FKeyframe_ctrlpoint_get", "rna_FKeyframe_ctrlpoint_set", NULL);
        RNA_def_property_ui_text(prop, "Control Point", "Coordinates of the control point");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
        
        prop= RNA_def_property(srna, "handle2", PROP_FLOAT, PROP_TRANSLATION);
        RNA_def_property_array(prop, 2);
        RNA_def_property_float_funcs(prop, "rna_FKeyframe_handle2_get", "rna_FKeyframe_handle2_set", NULL);
        RNA_def_property_ui_text(prop, "Handle 2", "Coordinates of the second handle");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
 }
 
 static void rna_def_fcurve_modifiers(BlenderRNA *brna, PropertyRNA *cprop)
@@ -1387,17 +1387,17 @@ static void rna_def_fcurve(BlenderRNA *brna)
        prop= RNA_def_property(srna, "selected", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "flag", FCURVE_SELECTED);
        RNA_def_property_ui_text(prop, "Selected", "F-Curve is selected for editing");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_SELECT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_SELECTED, NULL);
        
        prop= RNA_def_property(srna, "locked", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "flag", FCURVE_PROTECTED);
        RNA_def_property_ui_text(prop, "Locked", "F-Curve's settings cannot be edited");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL);
        
        prop= RNA_def_property(srna, "muted", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "flag", FCURVE_MUTED);
        RNA_def_property_ui_text(prop, "Muted", "F-Curve is not evaluated");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN_EDIT, NULL);
+       RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL);
        
        prop= RNA_def_property(srna, "auto_clamped_handles", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "flag", FCURVE_AUTO_HANDLES);
index 7b8d483..e43f494 100644 (file)
@@ -205,7 +205,7 @@ static void particle_recalc(Main *bmain, Scene *scene, PointerRNA *ptr, short fl
        else
                DAG_id_flush_update(ptr->id.data, OB_RECALC_DATA|flag);
 
-       WM_main_add_notifier(NC_OBJECT|ND_PARTICLE_DATA, NULL);
+       WM_main_add_notifier(NC_OBJECT|ND_PARTICLE|NA_EDITED, NULL);
 }
 static void rna_Particle_redo(Main *bmain, Scene *scene, PointerRNA *ptr)
 {
@@ -269,7 +269,7 @@ static void rna_Particle_target_reset(Main *bmain, Scene *scene, PointerRNA *ptr
                DAG_scene_sort(scene);
        }
 
-       WM_main_add_notifier(NC_OBJECT|ND_PARTICLE_DATA, NULL);
+       WM_main_add_notifier(NC_OBJECT|ND_PARTICLE|NA_EDITED, NULL);
 }
 
 static void rna_Particle_target_redo(Main *bmain, Scene *scene, PointerRNA *ptr)
@@ -281,7 +281,7 @@ static void rna_Particle_target_redo(Main *bmain, Scene *scene, PointerRNA *ptr)
                psys->recalc = PSYS_RECALC_REDO;
 
                DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
-               WM_main_add_notifier(NC_OBJECT|ND_PARTICLE_DATA, NULL);
+               WM_main_add_notifier(NC_OBJECT|ND_PARTICLE|NA_EDITED, NULL);
        }
 }
 
@@ -297,7 +297,7 @@ static void rna_Particle_hair_dynamics(Main *bmain, Scene *scene, PointerRNA *pt
                rna_Particle_redo(bmain, scene, ptr);
        }
        else
-               WM_main_add_notifier(NC_OBJECT|ND_PARTICLE_DATA, NULL);
+               WM_main_add_notifier(NC_OBJECT|ND_PARTICLE|NA_EDITED, NULL);
 }
 static PointerRNA rna_particle_settings_get(PointerRNA *ptr)
 {
index dc157ce..3a7e7a0 100644 (file)
@@ -137,7 +137,7 @@ static void rna_ParticleEdit_tool_set(PointerRNA *ptr, int value)
                Object *ob = (pset->scene->basact)? pset->scene->basact->object: NULL;
                if(ob) {
                        DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
-                       WM_main_add_notifier(NC_OBJECT|ND_PARTICLE_DATA, NULL);
+                       WM_main_add_notifier(NC_OBJECT|ND_PARTICLE|NA_EDITED, NULL);
                }
        }
 
index b4d7b55..c52fd7f 100644 (file)
@@ -690,17 +690,17 @@ static void rna_def_sequence(BlenderRNA *brna)
        prop= RNA_def_property(srna, "selected", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "flag", SELECT);
        RNA_def_property_ui_text(prop, "Selected", "");
-       RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER_SELECT, NULL);
+       RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER|NA_SELECTED, NULL);
 
        prop= RNA_def_property(srna, "left_handle_selected", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "flag", SEQ_LEFTSEL);
        RNA_def_property_ui_text(prop, "Left Handle Selected", "");
-       RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER_SELECT, NULL);
+       RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER|NA_SELECTED, NULL);
 
        prop= RNA_def_property(srna, "right_handle_selected", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "flag", SEQ_RIGHTSEL);
        RNA_def_property_ui_text(prop, "Right Handle Selected", "");
-       RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER_SELECT, NULL);
+       RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER|NA_SELECTED, NULL);
 
        prop= RNA_def_property(srna, "mute", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "flag", SEQ_MUTE);
index 2d582d5..3058fe6 100644 (file)
@@ -1609,7 +1609,7 @@ static void rna_def_space_dopesheet(BlenderRNA *brna)
        RNA_def_property_flag(prop, PROP_EDITABLE);
        RNA_def_property_pointer_funcs(prop, NULL, "rna_SpaceDopeSheetEditor_action_set", NULL);
        RNA_def_property_ui_text(prop, "Action", "Action displayed and edited in this space");
-       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, "rna_SpaceDopeSheetEditor_action_update");
+       RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, "rna_SpaceDopeSheetEditor_action_update");
        
        /* mode */
        prop= RNA_def_property(srna, "mode", PROP_ENUM, PROP_NONE);
index 3b83e4b..199b17b 100644 (file)
@@ -183,7 +183,6 @@ typedef struct wmNotifier {
 #define ND_KEYINGSET           (12<<16)
 #define ND_TOOLSETTINGS                (13<<16)
 #define ND_LAYER                       (14<<16)
-#define        ND_SEQUENCER_SELECT     (15<<16)
 
        /* NC_OBJECT Object */
 #define        ND_TRANSFORM            (16<<16)
@@ -192,11 +191,10 @@ typedef struct wmNotifier {
 #define ND_BONE_ACTIVE         (19<<16)
 #define ND_BONE_SELECT         (20<<16)
 #define ND_DRAW                                (21<<16)
-#define ND_MODIFIER                    (22<<16) /* modifiers edited */
+#define ND_MODIFIER                    (22<<16)
 #define ND_KEYS                                (23<<16)
-#define ND_CONSTRAINT          (24<<16) /* constraints edited */
-#define ND_PARTICLE_DATA       (25<<16) /* particles edited */
-#define ND_PARTICLE_SELECT     (26<<16) /* particles selecting change */
+#define ND_CONSTRAINT          (24<<16)
+#define ND_PARTICLE                    (25<<16)
 
        /* NC_MATERIAL Material */
 #define        ND_SHADING                      (30<<16)
@@ -215,15 +213,12 @@ typedef struct wmNotifier {
 #define ND_DISPLAY                     (51<<16)
        
        /* NC_ANIMATION Animato */
-#define ND_KEYFRAME_SELECT     (70<<16)
-#define ND_KEYFRAME_EDIT       (71<<16)
-#define ND_KEYFRAME_PROP       (72<<16)
-#define ND_ANIMCHAN_SELECT     (73<<16)
-#define ND_ANIMCHAN_EDIT       (74<<16)
-#define ND_NLA_SELECT          (75<<16)
-#define ND_NLA_EDIT                    (76<<16)
-#define ND_NLA_ACTCHANGE       (77<<16)
-#define ND_FCURVES_ORDER       (78<<16)
+#define ND_KEYFRAME                    (70<<16)
+#define ND_KEYFRAME_PROP       (71<<16)
+#define ND_ANIMCHAN                    (72<<16)
+#define ND_NLA                         (73<<16)
+#define ND_NLA_ACTCHANGE       (74<<16)
+#define ND_FCURVES_ORDER       (75<<16)
 
        /* NC_GEOM Geometry */
        /* Mesh, Curve, MetaBall, Armature, .. */
@@ -231,7 +226,6 @@ typedef struct wmNotifier {
 #define ND_DATA                                (91<<16)
 
        /* NC_NODE Nodes */
-#define ND_NODE_SELECT                 (1<<16)
 
        /* NC_SPACE */
 #define ND_SPACE_CONSOLE               (1<<16) /* general redraw */
@@ -279,6 +273,7 @@ typedef struct wmNotifier {
 #define NA_ADDED                       3
 #define NA_REMOVED                     4
 #define NA_RENAME                      5
+#define NA_SELECTED                    6
 
 /* ************** Gesture Manager data ************** */