Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Mon, 8 Jan 2018 08:39:32 +0000 (09:39 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Mon, 8 Jan 2018 08:39:32 +0000 (09:39 +0100)
commitc26da06ae67348f62b27af33b76f2d18e6c7c274
tree599d76f3b8ce2dc08b20e5617d11854314d12da2
parent84d4476eb11cddcc88c8271c22bb8d1051421f0d
parent96e507d9890e42695ea0c6bff0c8fa5c480bbb5a
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/library_query.c
source/blender/blenkernel/intern/node.c
source/blender/blenloader/intern/readfile.c
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_object_force.c
source/blender/nodes/composite/nodes/node_composite_image.c