[Bf-blender-cvs] [5b45258fff5] greasepencil-object: Fix: Doing a Scene "full-copy" wouldn't relink the gp_object

[Joshua Leung]

Commit: 5b45258fff550d9b7c4b2ea7d0dac14f6c22f915
Author: Joshua Leung
Date:   Tue Sep 26 15:12:50 2017 +1300
Branches: greasepencil-object
https://developer.blender.org/rB5b45258fff550d9b7c4b2ea7d0dac14f6c22f915

Fix: Doing a Scene "full-copy" wouldn't relink the gp_object

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

M	source/blender/blenkernel/intern/scene.c
M	source/blender/editors/object/object_relations.c

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

diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 66fffd1e545..8f7e7a053c6 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -584,11 +584,12 @@ Scene *BKE_scene_copy(Main *bmain, Scene *sce, int type)
 		}
 
 		/* NOTE: part of SCE_COPY_LINK_DATA and SCE_COPY_FULL operations
-		 * are done outside of blenkernel with ED_objects_single_users! */
+		 * are done outside of blenkernel with ED_object_single_users! */
 
-		/*  camera */
+		/*  camera and gp_object  */
 		if (ELEM(type, SCE_COPY_LINK_DATA, SCE_COPY_FULL)) {
 			ID_NEW_REMAP(sce_copy->camera);
+			ID_NEW_REMAP(sce_copy->gp_object);
 		}
 
 		return sce_copy;
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c
index 04ac42a5471..f87e34833b1 100644
--- a/source/blender/editors/object/object_relations.c
+++ b/source/blender/editors/object/object_relations.c
@@ -1727,9 +1727,13 @@ static void single_object_users(Main *bmain, Scene *scene, View3D *v3d, const in
 	/* group pointers in scene */
 	BKE_scene_groups_relink(scene);
 
+	/* active camera */
 	ID_NEW_REMAP(scene->camera);
 	if (v3d) ID_NEW_REMAP(v3d->camera);
 
+	/* gp_object */
+	ID_NEW_REMAP(scene->gp_object);
+
 	/* object and group pointers */
 	libblock_relink_scene_collection(msc);