Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 22 Sep 2017 08:26:49 +0000 (13:26 +0500)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 22 Sep 2017 08:26:49 +0000 (13:26 +0500)
commit128c7c3ba1d15e08241ec3e90fa694cfb210d2b9
treeb463c1b7df7de21673d4c5dca319390a3f1d1106
parent225e52eaf89039dccf66a4f503fdb7007b1a0394
parentf320d0e0a86207983ca4f7e7afb4fa7a140acf99
Merge branch 'master' into blender2.8
build_files/build_environment/install_deps.sh
intern/cycles/blender/blender_mesh.cpp
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/editderivedmesh.c
source/blender/blenkernel/intern/mask.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/collada/DocumentExporter.cpp
source/blender/editors/curve/editfont.c
source/blender/editors/interface/interface_regions.c
source/blender/editors/space_action/space_action.c
source/creator/CMakeLists.txt