Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Gavrilov <angavrilov@gmail.com>2019-04-17 14:43:02 +0300
committerAlexander Gavrilov <angavrilov@gmail.com>2019-04-17 14:43:27 +0300
commit6770f76bd49f0104e51d2c8a523e880f0c40cf7a (patch)
treef2b49e710409736f934180f4448f0fd3cf74fd4c /source/blender/editors/animation/anim_channels_defines.c
parent05b8b540184555287a7579c9734158bf29e0fccb (diff)
Fix T60982: don't allow editing group properties in linked actions.
Diffstat (limited to 'source/blender/editors/animation/anim_channels_defines.c')
-rw-r--r--source/blender/editors/animation/anim_channels_defines.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c
index a4fc022821a..67d0e969735 100644
--- a/source/blender/editors/animation/anim_channels_defines.c
+++ b/source/blender/editors/animation/anim_channels_defines.c
@@ -4630,12 +4630,14 @@ static void draw_setting_widget(bAnimContext *ac,
UI_but_func_set(but, achannel_setting_widget_cb, NULL, NULL);
break;
}
- }
- }
- if ((ale->fcurve_owner_id != NULL && ID_IS_LINKED(ale->fcurve_owner_id)) ||
- (ale->id != NULL && ID_IS_LINKED(ale->id))) {
- UI_but_flag_enable(but, UI_BUT_DISABLED);
+ if ((ale->fcurve_owner_id != NULL && ID_IS_LINKED(ale->fcurve_owner_id)) ||
+ (ale->id != NULL && ID_IS_LINKED(ale->id))) {
+ if (setting != ACHANNEL_SETTING_EXPAND) {
+ UI_but_flag_enable(but, UI_BUT_DISABLED);
+ }
+ }
+ }
}
}