Merge branch 'blender2.7'
authorJulian Eisel <eiseljulian@gmail.com>
Sat, 9 Mar 2019 16:19:52 +0000 (17:19 +0100)
committerJulian Eisel <eiseljulian@gmail.com>
Sat, 9 Mar 2019 16:19:52 +0000 (17:19 +0100)
commit40412499433ef6d8619fd1e8ecaa00addb163721
tree17f9e5f936237cb4714f5ef0361f09dd0435db92
parentba4d07cc5c74e42445a59bf1e77587cbf4a83482
parent0a28bb14222c7753a987256a9c155b670137ee37
Merge branch 'blender2.7'

Conflicts:
intern/cycles/blender/addon/properties.py
intern/cycles/device/opencl/opencl_split.cpp
intern/cycles/blender/addon/properties.py
intern/cycles/blender/addon/ui.py
intern/cycles/blender/blender_python.cpp
source/blender/editors/screen/area.c
source/blender/editors/screen/screen_edit.c