Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 3 Jan 2018 12:44:47 +0000 (23:44 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 3 Jan 2018 12:44:47 +0000 (23:44 +1100)
14 files changed:
1  2 
build_files/build_environment/install_deps.sh
intern/cycles/device/device_cuda.cpp
intern/cycles/device/device_multi.cpp
intern/cycles/render/buffers.cpp
release/scripts/startup/bl_operators/uvcalc_smart_project.py
release/scripts/startup/bl_ui/properties_particle.py
source/blender/blenkernel/intern/mesh_evaluate.c
source/blender/blenkernel/intern/sequencer.c
source/blender/blenkernel/intern/subsurf_ccg.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/armature/armature_relations.c
source/blender/editors/interface/interface_layout.c

Simple merge
Simple merge
Simple merge