diff options
author | Joshua Leung <aligorith@gmail.com> | 2009-09-04 14:41:02 +0400 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2009-09-04 14:41:02 +0400 |
commit | 1e6efcc96526a0d1ba16384c5500959ec9b5824d (patch) | |
tree | 0703bf4a9228368eb18238358e578ee28421c7c3 /source | |
parent | bade641408882919ef3f22b3d5223d533678120c (diff) |
2.5 - KeyingSet fixes
* Fixed warnings in console about missing (removed) property
* Fixed update problems after creating a new keyingset
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/animation/keyingsets.c | 5 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_anim.c | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/editors/animation/keyingsets.c b/source/blender/editors/animation/keyingsets.c index a91a9bfa911..15d47211615 100644 --- a/source/blender/editors/animation/keyingsets.c +++ b/source/blender/editors/animation/keyingsets.c @@ -133,6 +133,7 @@ static int add_keyingset_button_exec (bContext *C, wmOperator *op) /* add path to this setting */ BKE_keyingset_add_destination(ks, ptr.id.data, NULL, path, index, pflag, KSP_GROUP_KSNAME); + success= 1; /* free the temp path created */ MEM_freeN(path); @@ -144,7 +145,7 @@ static int add_keyingset_button_exec (bContext *C, wmOperator *op) ED_anim_dag_flush_update(C); /* for now, only send ND_KEYS for KeyingSets */ - WM_event_add_notifier(C, ND_KEYS, NULL); + WM_event_add_notifier(C, NC_SCENE|ND_KEYINGSET, NULL); } return (success)? OPERATOR_FINISHED: OPERATOR_CANCELLED; @@ -222,7 +223,7 @@ static int remove_keyingset_button_exec (bContext *C, wmOperator *op) ED_anim_dag_flush_update(C); /* for now, only send ND_KEYS for KeyingSets */ - WM_event_add_notifier(C, ND_KEYS, NULL); + WM_event_add_notifier(C, NC_SCENE|ND_KEYINGSET, NULL); } return (success)? OPERATOR_FINISHED: OPERATOR_CANCELLED; diff --git a/source/blender/editors/interface/interface_anim.c b/source/blender/editors/interface/interface_anim.c index 8e15bbde201..8c41726b81b 100644 --- a/source/blender/editors/interface/interface_anim.c +++ b/source/blender/editors/interface/interface_anim.c @@ -283,11 +283,11 @@ void ui_but_anim_menu(bContext *C, uiBut *but) if(length) { uiItemBooleanO(layout, "Add All to Keying Set", 0, "ANIM_OT_add_keyingset_button", "all", 1); uiItemBooleanO(layout, "Add Single to Keying Set", 0, "ANIM_OT_add_keyingset_button", "all", 0); - uiItemBooleanO(layout, "Remove from Keying Set", 0, "ANIM_OT_remove_keyingset_button", "all", 0); + uiItemO(layout, "Remove from Keying Set", 0, "ANIM_OT_remove_keyingset_button"); } else { uiItemBooleanO(layout, "Add to Keying Set", 0, "ANIM_OT_add_keyingset_button", "all", 0); - uiItemBooleanO(layout, "Remove from Keying Set", 0, "ANIM_OT_remove_keyingset_button", "all", 0); + uiItemO(layout, "Remove from Keying Set", 0, "ANIM_OT_remove_keyingset_button"); } } |