Commit: fdf0191d78d071d175a37ca2d4417bc9dc2fadb2
Author: Antonio Vazquez
Date: Mon Nov 6 18:44:25 2017 +0100
Branches: greasepencil-object
https://developer.blender.org/rBfdf0191d78d071d175a37ca2d4417bc9dc2fadb2
Merge branch 'blender2.8' into greasepencil-object
===================================================================
===================================================================
diff --cc source/blender/editors/space_outliner/outliner_tree.c
index a2dbae4968c,88c5aa431c9..f699b5506eb
--- a/source/blender/editors/space_outliner/outliner_tree.c
+++ b/source/blender/editors/space_outliner/outliner_tree.c
@@@ -444,10 -444,10 +444,10 @@@ static void outliner_add_object_content
outliner_add_element(soops, &te->subtree, ob->poselib, te, 0, 0); //
XXX FIXME.. add a special type for this
- if (ob->proxy && !ID_IS_LINKED_DATABLOCK(ob))
+ if (ob->proxy && !ID_IS_LINKED(ob))
outliner_add_element(soops, &te->subtree, ob->proxy, te,
TSE_PROXY, 0);
- outliner_add_element(soops, &te->subtree, ob->gpd, te, 0, 0);
+ //outliner_add_element(soops, &te->subtree, ob->gpd, te, 0, 0); /*
FIXME: Kept for now to make it easier to identify these objects for fixing */
outliner_add_element(soops, &te->subtree, ob->data, te, 0, 0);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
