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)
1  2 
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