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

[Antonio Vazquez]

Commit: ee7e4d25d5fdf1bc3b37bcd3d3864008ed67d75f
Author: Antonio Vazquez
Date:   Thu Nov 30 15:34:21 2017 +0100
Branches: greasepencil-object
https://developer.blender.org/rBee7e4d25d5fdf1bc3b37bcd3d3864008ed67d75f

Merge branch 'blender2.8' into greasepencil-object

 Conflicts:
	source/blender/editors/object/object_relations.c

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



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

diff --cc source/blender/editors/object/object_relations.c
index af600cb8e23,b2e976f17a9..cbca55a4d1f
--- a/source/blender/editors/object/object_relations.c
+++ b/source/blender/editors/object/object_relations.c
@@@ -1846,12 -1842,15 +1847,18 @@@ static void single_obdata_users(Main *b
  					case OB_SPEAKER:
  						ob->data = ID_NEW_SET(ob->data, BKE_speaker_copy(bmain, ob->data));
  						break;
+ 					case OB_LIGHTPROBE:
+ 						ob->data = ID_NEW_SET(ob->data, BKE_lightprobe_copy(bmain, ob->data));
+ 						break;
 +					case OB_GPENCIL:
 +						ob->data = ID_NEW_SET(ob->data, BKE_gpencil_copy(bmain, ob->data));
 +						break;
  					default:
- 						if (G.debug & G_DEBUG)
- 							printf("ERROR %s: can't copy %s\n", __func__, id->name);
+ 						printf("ERROR %s: can't copy %s\n", __func__, id->name);
+ 						BLI_assert(!"This should never happen.");
+ 
+ 						/* We need to end the FOREACH_OBJECT_FLAG iterator to prevent memory leak. */
+ 						BKE_scene_objects_iterator_end(&iter_macro);
  						return;
  				}