Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 9 Nov 2017 09:59:15 +0000 (10:59 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 9 Nov 2017 09:59:15 +0000 (10:59 +0100)
commitc99481b6320a77e4793c812403f7d37dfc2d5ced
tree448226ab76b4f2d92263cc115828c23f1f753540
parentffe76ae9f4abe2a64d4c749623b99f70b3746d87
parent8d7ec519dff93b04fdec548aeef4b90137d788c8
Merge branch 'master' into blender2.8
12 files changed:
intern/cycles/device/device.cpp
intern/cycles/device/device.h
intern/cycles/device/device_cuda.cpp
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
source/blender/depsgraph/intern/builder/deg_builder_nodes.h
source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc
source/blender/depsgraph/intern/builder/deg_builder_nodes_scene.cc
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/depsgraph/intern/builder/deg_builder_relations.h
source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc
source/blender/depsgraph/intern/builder/deg_builder_relations_scene.cc
source/blender/depsgraph/intern/depsgraph_build.cc