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)
commit7fdb9e168dcd35d2695007cc77b3b27034a21cd5
tree614f5b6741644d6de394152724eb2d85c8d06c75
parent64de8c8f0de018f5d2b075db738d7b6322d6d21a
parent75e8e3779bcf59622b9e7c43529ca9f91b40a917
Merge branch 'master' into blender2.8
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