diff options
| author | Bastien Montagne <bastien@blender.org> | 2022-03-28 18:34:36 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2022-03-29 18:59:55 +0300 |
| commit | 5596f79821caae3d4c1eb608ce77371904f74b80 (patch) | |
| tree | 92dbb06728dd7bbecfa71d17dbe25cde49dfdeb5 /source/blender/editors/animation/keyframes_draw.c | |
| parent | 354db59fb12a5ee595ae650ac3a736e3cc6df39d (diff) | |
LibOverride: Massive edits to 'editable' IDs checks in editors code.
Add new `BKE_id_is_editable` helper in `BKE_lib_id.h`, that supercedes
previous check (simple `ID_IS_LINKED()` macro) for many editing cases.
This allows to also take into account 'system override' (aka
non-editable override) case.
Ref: {T95707}.
Diffstat (limited to 'source/blender/editors/animation/keyframes_draw.c')
| -rw-r--r-- | source/blender/editors/animation/keyframes_draw.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/editors/animation/keyframes_draw.c b/source/blender/editors/animation/keyframes_draw.c index f40c1b983d7..58d093c678d 100644 --- a/source/blender/editors/animation/keyframes_draw.c +++ b/source/blender/editors/animation/keyframes_draw.c @@ -659,7 +659,8 @@ void draw_fcurve_channel(AnimKeylistDrawList *draw_list, { const bool locked = (fcu->flag & FCURVE_PROTECTED) || ((fcu->grp) && (fcu->grp->flag & AGRP_PROTECTED)) || - ((adt && adt->action) && ID_IS_LINKED(adt->action)); + ((adt && adt->action) && + (ID_IS_LINKED(adt->action) || ID_IS_OVERRIDE_LIBRARY(adt->action))); AnimKeylistDrawListElem *draw_elem = ed_keylist_draw_list_add_elem( draw_list, ANIM_KEYLIST_FCURVE, ypos, yscale_fac, saction_flag); @@ -676,7 +677,8 @@ void draw_agroup_channel(AnimKeylistDrawList *draw_list, int saction_flag) { bool locked = (agrp->flag & AGRP_PROTECTED) || - ((adt && adt->action) && ID_IS_LINKED(adt->action)); + ((adt && adt->action) && + (ID_IS_LINKED(adt->action) || ID_IS_OVERRIDE_LIBRARY(adt->action))); AnimKeylistDrawListElem *draw_elem = ed_keylist_draw_list_add_elem( draw_list, ANIM_KEYLIST_AGROUP, ypos, yscale_fac, saction_flag); @@ -692,7 +694,7 @@ void draw_action_channel(AnimKeylistDrawList *draw_list, float yscale_fac, int saction_flag) { - const bool locked = (act && ID_IS_LINKED(act)); + const bool locked = (act && (ID_IS_LINKED(act) || ID_IS_OVERRIDE_LIBRARY(act))); saction_flag &= ~SACTION_SHOW_EXTREMES; AnimKeylistDrawListElem *draw_elem = ed_keylist_draw_list_add_elem( |