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)
commit21f16bb93e1e29a9737edc5bfddcecdcbdfd9f73
tree3ce8a5a3ce4442f64872ad38fccbcad31379aa59
parent8eb8aa49397fb038ffa98dbe5dc4aed86e7b3e94
parent4f8e407086068e3eeca50db6b37b5c8a5a358696
Merge branch 'master' into blender2.8
CMakeLists.txt
source/blender/makesrna/intern/rna_space.c