Merge branch 'master' into blender2.8
authorJulian Eisel <eiseljulian@gmail.com>
Sun, 7 May 2017 22:19:22 +0000 (00:19 +0200)
committerJulian Eisel <eiseljulian@gmail.com>
Sun, 7 May 2017 22:19:22 +0000 (00:19 +0200)
commit9181f13af710f39e28368461f9979ce2052a55ee
treebb4dae8ee41e31d25ba980aa996c3e62539a59e0
parentc47926542acf1fc342b4d0b8f7ccaf1e3a8be6d8
parentce28025eaf5014f16460dd1cb798ce5292087d94
Merge branch 'master' into blender2.8
17 files changed:
intern/cycles/blender/addon/engine.py
intern/cycles/blender/addon/properties.py
intern/cycles/blender/addon/ui.py
intern/cycles/blender/blender_session.cpp
intern/cycles/blender/blender_session.h
intern/cycles/blender/blender_sync.cpp
intern/cycles/blender/blender_sync.h
intern/cycles/device/device.cpp
intern/cycles/device/device.h
intern/cycles/device/device_cuda.cpp
intern/cycles/device/device_multi.cpp
intern/cycles/render/buffers.cpp
source/blender/editors/space_node/drawnode.c
source/blender/makesrna/intern/rna_render.c
source/blender/render/extern/include/RE_engine.h
source/blender/render/intern/source/external_engine.c
source/blenderplayer/bad_level_call_stubs/stubs.c