[Bf-blender-cvs] [9307f08] master: Fix (unreported) Outliner letting you edit path of indirect linked lib shown at 'first level'.

Bastien Montagne noreply at git.blender.org
Wed Sep 9 12:28:52 CEST 2015


Commit: 9307f0898625fcc50b9060e8897efda28453cf3a
Author: Bastien Montagne
Date:   Wed Sep 9 12:26:58 2015 +0200
Branches: master
https://developer.blender.org/rB9307f0898625fcc50b9060e8897efda28453cf3a

Fix (unreported) Outliner letting you edit path of indirect linked lib shown at 'first level'.

>From Gooseberry team request indirect libs were also added at root of 'BlendFile' Outliner view,
but that allowed edition of their path, which is useless...

===================================================================

M	source/blender/editors/space_outliner/outliner_edit.c

===================================================================

diff --git a/source/blender/editors/space_outliner/outliner_edit.c b/source/blender/editors/space_outliner/outliner_edit.c
index 1ddd25f..6d42067 100644
--- a/source/blender/editors/space_outliner/outliner_edit.c
+++ b/source/blender/editors/space_outliner/outliner_edit.c
@@ -220,7 +220,7 @@ static void do_item_rename(ARegion *ar, TreeElement *te, TreeStoreElem *tselem,
 	else if (tselem->id->lib) {
 		BKE_report(reports, RPT_WARNING, "Cannot edit external libdata");
 	}
-	else if (te->idcode == ID_LI && te->parent) {
+	else if (te->idcode == ID_LI && ((Library *)tselem->id)->parent) {
 		BKE_report(reports, RPT_WARNING, "Cannot edit the path of an indirectly linked library");
 	}
 	else {




More information about the Bf-blender-cvs mailing list