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

[Antonio Vazquez]

Commit: 374e08db00b79d85a5cb386ee31822baac12cb68
Author: Antonio Vazquez
Date:   Fri Jun 1 19:38:27 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB374e08db00b79d85a5cb386ee31822baac12cb68

Merge branch 'blender2.8' into greasepencil-object

 Conflicts:
	source/blender/blenkernel/intern/object.c

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



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

diff --cc source/blender/blenkernel/intern/object.c
index ca2128511e7,2eb35908d63..d3e69255389
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@@ -1297,11 -1228,8 +1297,12 @@@ void BKE_object_copy_data(Main *UNUSED(
  	BLI_listbase_clear(&ob_dst->drawdata);
  	BLI_listbase_clear(&ob_dst->pc_ids);
  
 +	/* grease pencil: clean derived data */
 +	if (ob_dst->type == OB_GPENCIL)
 +		BKE_gpencil_free_derived_frames(ob_dst->data);
 +
- 	ob_dst->mpath = NULL;
+ 	ob_dst->avs = ob_src->avs;
+ 	ob_dst->mpath = animviz_copy_motionpath(ob_src->mpath);
  
  	copy_object_lod(ob_dst, ob_src, flag_subdata);