Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Sat, 19 Nov 2016 15:28:39 +0000 (16:28 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Sat, 19 Nov 2016 15:28:39 +0000 (16:28 +0100)
commit559bd7576602e04b1895481561b054e67982351c
treec17c92da080ff2336a340ecb86cb157272f04c55
parent5cbc7b6ed29645d793e813fab374add4e11fa4c7
parent369872a2c50e95eee822512018cc282ef5fcfdd1
Merge branch 'master' into blender2.8

Conflicts:
source/blender/blenloader/intern/versioning_270.c
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/editors/space_view3d/drawobject.c
intern/cycles/blender/addon/properties.py
intern/cycles/blender/addon/ui.py
release/scripts/startup/bl_ui/properties_paint_common.py
source/blender/blenkernel/intern/library_remap.c
source/blender/blenloader/intern/versioning_270.c
source/blender/blenloader/intern/writefile.c
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/depsgraph/intern/builder/deg_builder_relations.h
source/blender/editors/space_view3d/drawobject.c