diff options
author | Philipp Oeser <info@graphics-engineer.com> | 2020-05-13 14:18:27 +0300 |
---|---|---|
committer | Philipp Oeser <info@graphics-engineer.com> | 2020-05-13 16:30:16 +0300 |
commit | c7f74863dde1a417e2742d3dadb4f5fd8bfc36af (patch) | |
tree | 1ad8d6941354ca1b5d4c45900aab826e13de3039 | |
parent | 5159b8e1eadb3803064a97874f7ebc059ce2be32 (diff) |
Fix T76711: override data-blocks could be renamed in the outliner
Overriding datablock should never have an editable name.
This also moves the check for linked/overridden datablocks above the
check for master-collection (otherwise a linked/overriden collection
could still be renamed)
Maniphest Tasks: T76711
Differential Revision: https://developer.blender.org/D7718
-rw-r--r-- | source/blender/editors/space_outliner/outliner_edit.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/editors/space_outliner/outliner_edit.c b/source/blender/editors/space_outliner/outliner_edit.c index 469a0065e3a..181be13f959 100644 --- a/source/blender/editors/space_outliner/outliner_edit.c +++ b/source/blender/editors/space_outliner/outliner_edit.c @@ -352,6 +352,12 @@ static void do_item_rename(ARegion *region, else if (ELEM(tselem->type, TSE_SEQUENCE, TSE_SEQ_STRIP, TSE_SEQUENCE_DUP)) { BKE_report(reports, RPT_WARNING, "Cannot edit sequence name"); } + else if (ID_IS_LINKED(tselem->id)) { + BKE_report(reports, RPT_WARNING, "Cannot edit external library data"); + } + else if (ID_IS_OVERRIDE_LIBRARY(tselem->id)) { + BKE_report(reports, RPT_WARNING, "Cannot edit name of an override data-block"); + } else if (outliner_is_collection_tree_element(te)) { Collection *collection = outliner_collection_from_tree_element(te); @@ -362,9 +368,6 @@ static void do_item_rename(ARegion *region, add_textbut = true; } } - else if (ID_IS_LINKED(tselem->id)) { - BKE_report(reports, RPT_WARNING, "Cannot edit external library data"); - } else if (te->idcode == ID_LI && ((Library *)tselem->id)->parent) { BKE_report(reports, RPT_WARNING, "Cannot edit the path of an indirectly linked library"); } |