diff options
| author | Joshua Leung <aligorith@gmail.com> | 2010-09-30 14:39:05 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2010-09-30 14:39:05 +0400 |
| commit | cca8fce807424b0601064387659c3818de1ae049 (patch) | |
| tree | 731a7ad923b0b82a2c38eb88617952b271b6d1e0 /source/blender | |
| parent | 38c3a5f363e8b9391401a2e4c34b11a9c49adc54 (diff) | |
Bugfix #23031: adding a driver ontop of keyframe makes driver undeletable
Now drivers cannot be added to properties that have been animated (and visa versa). Previously, the check was only checking if there was a keyframe, not whether the property was animated.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index fd3e094b39e..c789c721aea 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -4129,7 +4129,7 @@ static int ui_but_menu(bContext *C, uiBut *but) if (ANIM_driver_can_paste()) uiItemO(layout, "Paste Driver", 0, "ANIM_OT_paste_driver_button"); } - else if(but->flag & UI_BUT_ANIMATED_KEY); + else if(but->flag & (UI_BUT_ANIMATED_KEY|UI_BUT_ANIMATED)); else if(RNA_property_animateable(&but->rnapoin, but->rnaprop)) { uiItemS(layout); |