Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 29 Sep 2017 09:55:00 +0000 (19:55 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 29 Sep 2017 09:55:00 +0000 (19:55 +1000)
commite3fe8128e41bb7c576f02ba234dfabf5c399cb60
treecd148a38fb32cdb1a36fc576b9f36fe864003e40
parent31be6fccf83095f4245f97730ccc7e61e51cfcec
parent5a1954a5cbd7b0b1458fdc80ada5acd036278309
Merge branch 'master' into blender2.8
26 files changed:
CMakeLists.txt
build_files/cmake/platform/platform_apple.cmake
build_files/cmake/platform/platform_unix.cmake
intern/ghost/intern/GHOST_WindowCocoa.mm
intern/ghost/intern/GHOST_WindowX11.cpp
release/scripts/startup/bl_ui/space_view3d.py
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/blenkernel/BKE_paint.h
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/paint.c
source/blender/blenloader/intern/versioning_270.c
source/blender/collada/GeometryExporter.cpp
source/blender/editors/include/ED_mesh.h
source/blender/editors/mesh/mesh_data.c
source/blender/editors/sculpt_paint/CMakeLists.txt
source/blender/editors/sculpt_paint/paint_intern.h
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/sculpt_paint/paint_vertex_color_ops.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_header.c
source/blender/editors/transform/transform_conversions.c
source/blender/gpu/intern/gpu_buffers.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_brush.c
source/blender/makesrna/intern/rna_mesh.c
source/creator/CMakeLists.txt