Merge branch 'blender2.7'
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 6 Feb 2019 14:22:53 +0000 (15:22 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 6 Feb 2019 14:22:53 +0000 (15:22 +0100)
commite21ae0bb267a54482108ddd4feed99c89241804b
tree5d5220c578c0e41533a2a4430018ced6ff13e08c
parente8292466bcb69282798bba5dd701fff514cb0b78
parentfccf506ed7fd96f8a8f5edda7b99f564a386321a
Merge branch 'blender2.7'
intern/cycles/blender/addon/engine.py
intern/cycles/blender/blender_session.cpp
intern/cycles/blender/blender_sync.cpp
intern/cycles/device/device_cpu.cpp
intern/cycles/device/device_cuda.cpp
intern/cycles/render/buffers.cpp
intern/cycles/render/film.cpp
intern/cycles/render/session.cpp