[Bf-blender-cvs] [ae0de604e49] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object

[Antonio Vazquez]

Commit: ae0de604e49a0025bdf801677189552cad96a870
Author: Antonio Vazquez
Date:   Thu May 24 08:31:25 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBae0de604e49a0025bdf801677189552cad96a870

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/editors/object/object_relations.c
index 2ed44585847,6925daa4b6c..afdea7186bd
--- a/source/blender/editors/object/object_relations.c
+++ b/source/blender/editors/object/object_relations.c
@@@ -1626,7 -1625,18 +1626,8 @@@ static Object *single_object_users_obje
  	/* base gets copy of object */
  	Object *obn = ID_NEW_SET(ob, BKE_object_copy(bmain, ob));
  
 -	/* remap gpencil parenting */
 -
 -	if (scene->gpd) {
 -		bGPdata *gpd = scene->gpd;
 -		for (bGPDlayer *gpl = gpd->layers.first; gpl; gpl = gpl->next) {
 -			if (gpl->parent == ob) {
 -				gpl->parent = obn;
 -			}
 -		}
 -	}
  
+ 	id_us_plus(&obn->id);
  	id_us_min(&ob->id);
  	return obn;
  }