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)
commit2c3d4f7e654b416665b19cb60e8d2bf0d7cde5dd
treeff5cfc343c62dbcedf8da2c0bb2fdf3cf082c297
parent0bf615fc2464a06b3e40fc5936873b67ec6dd684
parent53431a560e51d106e78de00f7faef5bfccc8e933
Merge branch 'master' into blender2.8
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