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)
commit6231a077ac96b546d41404ef423fc23e1fa01803
tree8c91217b49506ec6e7db7c48737e5ee6295df395
parent1b5e3e1c019e5209b557f6699902d275b9bc67aa
parenta6585fa4b1a7a4dd4b5ea21efcee36c8460ff5ec
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
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