Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Sun, 2 Oct 2016 16:53:01 +0000 (18:53 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Sun, 2 Oct 2016 16:53:01 +0000 (18:53 +0200)
commitc50ccc847613bbe02bea64cee3f744b449da170c
treeb4c4bf7ff6de61687691997eb077c28eef0420c7
parentba30b852f317494ad1c2f308295ee28a665e283a
parent3f9b69287d287af09c801a5203be07287128b2a0
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/library_query.c
source/blender/blenloader/intern/readfile.c
source/blender/depsgraph/intern/builder/deg_builder_relations.h
source/blender/editors/transform/transform_snap_object.c
source/blender/gpu/intern/gpu_material.c