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/space_outliner/outliner_draw.cc | |
| 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/space_outliner/outliner_draw.cc')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_draw.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/editors/space_outliner/outliner_draw.cc b/source/blender/editors/space_outliner/outliner_draw.cc index 9857abb3da7..a6f09a86eb4 100644 --- a/source/blender/editors/space_outliner/outliner_draw.cc +++ b/source/blender/editors/space_outliner/outliner_draw.cc @@ -2165,8 +2165,10 @@ static void outliner_draw_mode_column_toggle(uiBlock *block, /* Mode toggling handles its own undo state because undo steps need to be grouped. */ UI_but_flag_disable(but, UI_BUT_UNDO); - if (ID_IS_LINKED(&ob->id)) { - UI_but_disable(but, TIP_("Can't edit external library data")); + if (ID_IS_LINKED(&ob->id) || + (ID_IS_OVERRIDE_LIBRARY_REAL(ob) && + (ob->id.override_library->flag & IDOVERRIDE_LIBRARY_FLAG_SYSTEM_DEFINED) != 0)) { + UI_but_disable(but, TIP_("Can't edit library or non-editable override data")); } } |