Merge branch 'master' into blender2.8
authorStefan Werner <stefan.werner@tangent-animation.com>
Wed, 7 Nov 2018 13:27:41 +0000 (14:27 +0100)
committerStefan Werner <stefan.werner@tangent-animation.com>
Wed, 7 Nov 2018 13:30:09 +0000 (14:30 +0100)
commit9d0eac6ba5efe1b3712152c337fb171a771a8921
tree8d51f1b3800513d37211253cc3f93f6c2a929ca4
parent0c8aa85069fabd20d5f030f016a85ad060839066
parentd3dd3739f6fe1ba640cdcad12d6bf4da6b356c59
Merge branch 'master' into blender2.8
CMakeLists.txt
build_files/cmake/macros.cmake
build_files/cmake/platform/platform_apple.cmake
build_files/cmake/platform/platform_unix.cmake
build_files/cmake/platform/platform_win32.cmake
intern/cycles/app/CMakeLists.txt
intern/cycles/blender/addon/properties.py
intern/cycles/blender/addon/ui.py
intern/cycles/blender/blender_python.cpp
intern/cycles/blender/blender_sync.cpp
source/blender/python/intern/CMakeLists.txt