[Bf-blender-cvs] [a22f3cc] master: Fix outliner grease pencil color button

[Campbell Barton]

Commit: a22f3cccec367470ee0b72a8667f214e234e3fc8
Author: Campbell Barton
Date:   Sat Aug 22 16:37:35 2015 +1000
Branches: master
https://developer.blender.org/rBa22f3cccec367470ee0b72a8667f214e234e3fc8

Fix outliner grease pencil color button

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

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

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

diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c
index 48a15ea..aaca61e 100644
--- a/source/blender/editors/space_outliner/outliner_tree.c
+++ b/source/blender/editors/space_outliner/outliner_tree.c
@@ -848,6 +848,10 @@ static TreeElement *outliner_add_element(SpaceOops *soops, ListBase *lb, void *i
 		id = ((PointerRNA *)idv)->id.data;
 		if (!id) id = ((PointerRNA *)idv)->data;
 	}
+	else if (type == TSE_GP_LAYER) {
+		/* idv is the layer its self */
+		id = TREESTORE(parent)->id;
+	}
 
 	/* One exception */
 	if (type == TSE_ID_BASE) {