Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Tue, 12 Jun 2018 13:41:32 +0000 (15:41 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Tue, 12 Jun 2018 13:41:32 +0000 (15:41 +0200)
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

1  2 
source/blender/blenkernel/intern/curve.c
source/blender/blenkernel/intern/displist.c
source/blender/blenkernel/intern/font.c
source/blender/blenkernel/intern/object_dupli.c
source/blender/editors/curve/editfont.c
source/blender/editors/object/object_add.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);