Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 2 May 2018 10:46:14 +0000 (12:46 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 2 May 2018 10:46:14 +0000 (12:46 +0200)
commitd09920687c4474f5f6ccf0f089d359f69932afac
tree3fa95c573d162f2b228d1165b66f9bb6d41cf538
parentadc17317c5af23c0986a449da6d0aef130d1f503
parent128506eeb1a2d87393061b4c9783289a5e4b3275
Merge branch 'master' into blender2.8
intern/cycles/device/device_cuda.cpp
source/blender/blenlib/intern/math_color.c
source/blender/editors/interface/interface_draw.c
source/blender/editors/space_image/image_draw.c