Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 9 Oct 2017 14:36:36 +0000 (01:36 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 9 Oct 2017 14:36:36 +0000 (01:36 +1100)
commit6ec43a765b775960fd47df7ad450a521413012c0
treea8860d79cc38e31cf476f11b704aa0dff0e65768
parentabcda06934aba054de8540b66b13c2bbc5f8f515
parent4b3e6cb728cb5d0e603f3b23b32ad1f8bfc68558
Merge branch 'master' into blender2.8
CMakeLists.txt
intern/cycles/blender/addon/ui.py
intern/cycles/device/device.h
intern/cycles/device/device_cuda.cpp
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/makesrna/intern/rna_nodetree.c
source/creator/creator_args.c