Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 9 Nov 2018 13:34:33 +0000 (14:34 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 9 Nov 2018 13:34:33 +0000 (14:34 +0100)
commit78a6689aea1976d42ba0fca927f3e7572768e1fb
tree5c16e6461f82c00ebef4906f748dba2dc360e80f
parent6c10ec74d5ec3d6fbbc1531463c117332b91ebed
parentddabb21d0584e9874e8e5c62c04abe496ec7334b
Merge branch 'master' into blender2.8
17 files changed:
intern/cycles/blender/blender_python.cpp
intern/cycles/blender/blender_session.h
intern/cycles/blender/blender_shader.cpp
intern/cycles/blender/blender_sync.h
intern/cycles/blender/blender_util.h
intern/cycles/device/device.h
intern/cycles/device/device_cuda.cpp
intern/cycles/kernel/kernel_id_passes.h
intern/cycles/kernel/kernel_passes.h
intern/cycles/render/image.h
intern/cycles/render/light.h
intern/cycles/render/nodes.h
intern/cycles/render/shader.cpp
intern/cycles/render/shader.h
intern/cycles/util/util_math_intersect.h
intern/cycles/util/util_opengl.h
intern/cycles/util/util_view.cpp