Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Mon, 7 Aug 2017 14:16:43 +0000 (16:16 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Mon, 7 Aug 2017 14:16:43 +0000 (16:16 +0200)
commitb282716c3aae68d5fc781e7fc5df0241c3d91198
treeb6c50064fe3a0c07341cd70cf9745ea3092c8fb7
parent459365443f62d2f8e8718c1d1b0fbaafd6d765de
parent580741b317ae60eb3bf999d636da0325c7e67373
Merge branch 'master' into blender2.8
intern/cycles/blender/addon/properties.py
intern/cycles/blender/addon/ui.py
intern/cycles/blender/blender_sync.cpp
intern/cycles/device/device_cuda.cpp
source/blender/editors/space_clip/space_clip.c
source/blender/editors/space_sequencer/space_sequencer.c
source/blender/windowmanager/intern/wm_files.c
tests/python/CMakeLists.txt