Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 28 Sep 2017 11:13:09 +0000 (16:13 +0500)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 28 Sep 2017 11:13:09 +0000 (16:13 +0500)
1  2 
CMakeLists.txt
source/blender/blenkernel/intern/curve.c
source/blender/blenloader/intern/versioning_270.c
source/blender/blenloader/intern/versioning_defaults.c
source/blender/python/generic/bgl.c

diff --cc CMakeLists.txt
Simple merge
Simple merge