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

2.5 - KeyingSet fixes

Browse Source 
* Fixed warnings in console about missing (removed) property
* Fixed update problems after creating a new keyingset
This commit is contained in:
Joshua Leung 2009-09-04 10:41:02 +00:00
parent bade641408
commit 1e6efcc965
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/editors/animation/keyingsets.c
View File

@ -133,6 +133,7 @@ static int add_keyingset_button_exec (bContext *C, wmOperator *op)
/* add path to this setting */ /* add path to this setting */
BKE_keyingset_add_destination(ks, ptr.id.data, NULL, path, index, pflag, KSP_GROUP_KSNAME); BKE_keyingset_add_destination(ks, ptr.id.data, NULL, path, index, pflag, KSP_GROUP_KSNAME);
success= 1;
/* free the temp path created */ /* free the temp path created */
MEM_freeN(path); MEM_freeN(path);
@ -144,7 +145,7 @@ static int add_keyingset_button_exec (bContext *C, wmOperator *op)
ED_anim_dag_flush_update(C); ED_anim_dag_flush_update(C);
/* for now, only send ND_KEYS for KeyingSets */ /* 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; 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); ED_anim_dag_flush_update(C);
/* for now, only send ND_KEYS for KeyingSets */ /* 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; return (success)? OPERATOR_FINISHED: OPERATOR_CANCELLED;

4
source/blender/editors/interface/interface_anim.c
View File

@ -283,11 +283,11 @@ void ui_but_anim_menu(bContext *C, uiBut *but)
if(length) { if(length) {
uiItemBooleanO(layout, "Add All to Keying Set", 0, "ANIM_OT_add_keyingset_button", "all", 1); 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, "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 { else {
uiItemBooleanO(layout, "Add to Keying Set", 0, "ANIM_OT_add_keyingset_button", "all", 0); 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");
} }
} }