Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 6 Jul 2018 08:18:52 +0000 (10:18 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 6 Jul 2018 08:18:52 +0000 (10:18 +0200)
commitde777ad9e69320500bf05d97a7d6d60ba4fd0a93
treea1141843a3e1df137bbc6490641bedf12a12a8fa
parent6d38d824377c55aaaed7e8283e81a7128bf6f728
parent1daa20ad9f6f0c433a4e0a97a74e5beb9ea4e2c7
Merge branch 'master' into blender2.8
20 files changed:
intern/cycles/app/io_export_cycles_xml.py
intern/cycles/blender/blender_camera.cpp
intern/cycles/blender/blender_object.cpp
intern/cycles/blender/blender_particles.cpp
intern/cycles/blender/blender_python.cpp
intern/cycles/blender/blender_shader.cpp
intern/cycles/blender/blender_sync.cpp
intern/cycles/blender/blender_sync.h
intern/cycles/device/device.h
intern/cycles/device/device_multi.cpp
intern/cycles/render/buffers.cpp
intern/cycles/render/image.cpp
intern/cycles/render/image.h
intern/cycles/render/light.cpp
intern/cycles/render/light.h
intern/cycles/render/nodes.cpp
intern/cycles/render/nodes.h
intern/cycles/render/shader.cpp
intern/cycles/render/shader.h
intern/cycles/util/util_view.cpp