Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Sun, 27 May 2018 16:52:28 +0000 (18:52 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Sun, 27 May 2018 16:52:28 +0000 (18:52 +0200)
commite7010a05beba64af032707b1818af707f398cc8d
tree238bec03b65cbc3690301c51257186abc4495e7c
parent1863883a248faa1fcae4b99332c8d5e6d3957845
parent38cb29d67e5947f99824987dcd567a82cfd51646
Merge branch 'master' into blender2.8

Conflicts:
source/blender/makesrna/intern/rna_object_api.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_scene_api.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_scene_api.c