[Bf-blender-cvs] [6231a077ac9] blender2.8: Merge branch 'master' into blender2.8

[Bastien Montagne]

Commit: 6231a077ac96b546d41404ef423fc23e1fa01803
Author: Bastien Montagne
Date:   Tue Jun 12 15:41:32 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB6231a077ac96b546d41404ef423fc23e1fa01803

Merge branch 'master' into blender2.8

Conflicts:
	source/blender/blenkernel/BKE_group.h
	source/blender/blenkernel/BKE_object.h
	source/blender/blenkernel/intern/group.c
	source/blender/blenkernel/intern/library_remap.c
	source/blender/blenkernel/intern/object.c
	source/blender/blenloader/intern/readfile.c
	source/blender/editors/object/object_group.c
	source/blender/editors/object/object_relations.c
	source/blender/editors/physics/rigidbody_constraint.c
	source/blender/editors/physics/rigidbody_object.c
	source/blender/makesrna/intern/rna_group.c

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



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

diff --cc source/blender/blenkernel/intern/object_dupli.c
index 73e7041fda8,4201bf3d3fb..57cdfdebcd3
--- a/source/blender/blenkernel/intern/object_dupli.c
+++ b/source/blender/blenkernel/intern/object_dupli.c
@@@ -614,7 -655,7 +614,9 @@@ static void make_duplis_font(const Dupl
  	/* advance matching BLI_strncpy_wchar_from_utf8 */
  	for (a = 0; a < text_len; a++, ct++) {
  
- 		ob = find_family_object(cu->family, family_len, (unsigned int)text[a], family_gh);
 -		ob = find_family_object(ctx->bmain, cu->family, family_len, (unsigned int)text[a], family_gh);
++		/* XXX That G.main is *really* ugly, but not sure what to do here...
++		 * Definitively don't think it would be safe to put back Main *bmain pointer in DupliContext as done in 2.7x? */
++		ob = find_family_object(G.main, cu->family, family_len, (unsigned int)text[a], family_gh);
  		if (ob) {
  			vec[0] = fsize * (ct->xof - xof);
  			vec[1] = fsize * (ct->yof - yof);