Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 2 Feb 2018 03:15:29 +0000 (14:15 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 2 Feb 2018 03:15:29 +0000 (14:15 +1100)
commitc3eb22e2ab0f4f96d64d1de7969966efd5d45066
treed0472fa9bc46c4ed73fdd8c55e0e4a2616c3178f
parent7003c8a143dea49a4e4ccc6b26283933d87f4a87
parent88e69806b977a6ec97c807f5e97db3bf68cff759
Merge branch 'master' into blender2.8
build_files/cmake/platform/platform_win32.cmake
source/blender/collada/DocumentExporter.cpp
source/blender/editors/interface/view2d.c
source/blender/editors/object/object_vgroup.c
source/blender/editors/sculpt_paint/paint_vertex_proj.c
source/creator/CMakeLists.txt