[Bf-blender-cvs] [c0ed6a6bea0] greasepencil-object: Remove scene->gpd deprecated

[Antonio Vazquez]

Commit: c0ed6a6bea067373ad3f3d6ac73da0e70463b637
Author: Antonio Vazquez
Date:   Sat May 19 18:20:56 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBc0ed6a6bea067373ad3f3d6ac73da0e70463b637

Remove scene->gpd deprecated

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

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

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

diff --git a/source/blender/editors/gpencil/gpencil_utils.c b/source/blender/editors/gpencil/gpencil_utils.c
index ad41ae7698c..1fac5fe97db 100644
--- a/source/blender/editors/gpencil/gpencil_utils.c
+++ b/source/blender/editors/gpencil/gpencil_utils.c
@@ -172,9 +172,7 @@ bGPdata **ED_gpencil_data_get_pointers_direct(ID *screen_id, Scene *scene, ScrAr
 		}
 	}
 	
-	/* just fall back on the scene's GP data */
-	if (r_ptr) RNA_id_pointer_create((ID *)scene, r_ptr);
-	return (scene) ? &scene->gpd : NULL;
+	return NULL;
 }
 
 /* Get pointer to active Grease Pencil datablock, and an RNA-pointer to trace back to whatever owns it */
diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c
index 58ab8f3735e..bd5711f56f6 100644
--- a/source/blender/editors/space_outliner/outliner_tree.c
+++ b/source/blender/editors/space_outliner/outliner_tree.c
@@ -316,8 +316,6 @@ static void outliner_add_scene_contents(SpaceOops *soops, ListBase *lb, Scene *s
 	if (outliner_animdata_test(sce->adt))
 		outliner_add_element(soops, lb, sce, te, TSE_ANIM_DATA, 0);
 		
-	/* Grease Pencil */
-	outliner_add_element(soops, lb, sce->gpd, te, 0, 0);
 }
 
 TreeTraversalAction outliner_find_selected_objects(TreeElement *te, void *customdata)