Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 29 Aug 2018 14:09:59 +0000 (16:09 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 29 Aug 2018 14:09:59 +0000 (16:09 +0200)
commit31278eb4bcc73f95b5032d65ababf32812074c5c
tree5422141293391de231224143fb75dd0144fb78e3
parente81c352746483acb50fbeddbba4249cdcb51d952
parentb2c707747da9f930a05499e98874c35d9aee7193
Merge branch 'master' into blender2.8
build_files/cmake/platform/platform_apple.cmake
build_files/cmake/platform/platform_unix.cmake
intern/cycles/blender/addon/properties.py
intern/cycles/blender/blender_sync.cpp