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

[Antonio Vazquez]

Commit: b7d2a47c0612320a15dd45f8bad8d0baeb7034f2
Author: Antonio Vazquez
Date:   Fri Jul 20 13:33:52 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBb7d2a47c0612320a15dd45f8bad8d0baeb7034f2

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/blenkernel/BKE_object.h
index 4fe6fb9dbdd,79e4f1d448a..7d795c25a04
--- a/source/blender/blenkernel/BKE_object.h
+++ b/source/blender/blenkernel/BKE_object.h
@@@ -82,9 -74,8 +82,9 @@@ bool BKE_object_support_modifier_type_c
  
  void BKE_object_link_modifiers(struct Scene *scene, struct Object *ob_dst, const struct Object *ob_src);
  void BKE_object_free_modifiers(struct Object *ob, const int flag);
 +void BKE_object_free_shaderfx(struct Object *ob, const int flag);
  
- void BKE_object_make_proxy(struct Object *ob, struct Object *target, struct Object *gob);
+ void BKE_object_make_proxy(struct Main *bmain, struct Object *ob, struct Object *target, struct Object *gob);
  void BKE_object_copy_proxy_drivers(struct Object *ob, struct Object *target);
  
  bool BKE_object_exists_check(struct Main *bmain, const struct Object *obtest);
diff --cc source/blender/blenkernel/intern/object.c
index 00c0d8e7002,33ea13c9a38..c3b688d9f0f
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@@ -1229,11 -1150,9 +1229,11 @@@ void BKE_object_transform_copy(Object *
   *
   * \param flag  Copying options (see BKE_library.h's LIB_ID_COPY_... flags for more).
   */
- void BKE_object_copy_data(Main *UNUSED(bmain), Object *ob_dst, const Object *ob_src, const int flag)
+ void BKE_object_copy_data(Main *bmain, Object *ob_dst, const Object *ob_src, const int flag)
  {
  	ModifierData *md;
 +	GpencilModifierData *gmd;
 +	ShaderFxData *fx;
  
  	/* We never handle usercount here for own data. */
  	const int flag_subdata = flag | LIB_ID_CREATE_NO_USER_REFCOUNT;