blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 763 Projects 19 Wiki Activity

Merge branch 'blender-v2.83-release'

This commit is contained in:
Philipp Oeser 2020-05-13 15:49:26 +02:00
parent 3a1426afbd c7f74863dd
commit 5b043b0724
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/editors/space_outliner/outliner_edit.c
View File

@ -362,6 +362,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);
@ -372,9 +378,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");
}