Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 23 Mar 2018 14:25:27 +0000 (15:25 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 23 Mar 2018 14:25:27 +0000 (15:25 +0100)
1  2 
CMakeLists.txt
source/blender/makesrna/intern/rna_space.c

diff --cc CMakeLists.txt
Simple merge