Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 21 Jun 2018 13:02:38 +0000 (15:02 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 21 Jun 2018 13:02:38 +0000 (15:02 +0200)
commitc054a1a84867e652cd737cdab7ca790b6e038303
tree34dc2614a32aad4dd3ad8afc5df8768edededaae
parentd5552a6d4ba5bb4ac34fe149c2ac9d7ff3f723fe
parenta4f08297ed3c201c66a340e5261cac0aeb68b523
Merge branch 'master' into blender2.8
intern/cycles/device/device_cuda.cpp
release/scripts/startup/bl_ui/space_userpref.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/resources.c
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_userdef.c