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)
1  2 
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

Simple merge
Simple merge
Simple merge