Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Tue, 28 Aug 2018 17:15:08 +0000 (19:15 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Tue, 28 Aug 2018 17:15:08 +0000 (19:15 +0200)
commit871b7ba8922650c34b487fec29a9d677b1aeadfd
treea13c8635e43919aed3ad48afe096f6501bbeb9a2
parent55263c8a4c03c1add138e5191f98a8b68591289f
parent9fd0060c0f3458e53b38003d1388f16cb56f45d8
Merge branch 'master' into blender2.8
20 files changed:
CMakeLists.txt
build_files/buildbot/slave_compile.py
build_files/cmake/platform/platform_win32.cmake
intern/cycles/blender/addon/engine.py
intern/cycles/blender/blender_session.cpp
intern/cycles/blender/blender_shader.cpp
intern/cycles/blender/blender_sync.cpp
intern/cycles/device/device_cuda.cpp
intern/cycles/render/buffers.cpp
intern/cycles/render/light.cpp
intern/cycles/render/nodes.cpp
intern/cycles/util/util_math_intersect.h
intern/ghost/intern/GHOST_SystemWin32.cpp
intern/ghost/intern/GHOST_WindowWin32.cpp
intern/opencolorio/CMakeLists.txt
source/blender/blenkernel/intern/seqeffects.c
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
source/blender/makesrna/intern/rna_nodetree.c
source/blender/nodes/shader/nodes/node_shader_emission.c
source/creator/CMakeLists.txt