Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 12 Feb 2018 06:39:58 +0000 (17:39 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 12 Feb 2018 06:39:58 +0000 (17:39 +1100)
1  2 
source/blender/blenkernel/intern/blender.c
source/blender/editors/interface/CMakeLists.txt
source/blender/editors/interface/resources.c
source/blender/makesrna/intern/rna_userdef.c