Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 3 Oct 2017 07:59:06 +0000 (12:59 +0500)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 3 Oct 2017 07:59:06 +0000 (12:59 +0500)
commit2bfa061a15762e93f0391e3348f58bcfa512d8fc
treeb3d51e85572e3272c1e0a4c1817d011f61f81386
parent21369429168c5799125a63ef728947f4fd6668e9
parent2b3ff61d805ccbb219e773e1a5c69e02b0c90109
Merge branch 'master' into blender2.8

Notes:

- Changes in paint_vertex.c were simple to merge, mainly related on passing
  evaluation context.

- Conflicts in EditDM and drawmesh.c are solved using code from blender2.8
  branch. Those areas are deprecated and not to be used in final release.

  However, it's possible that some reference code from master is lost, so
  keep attention when adding alpha support for vertex painting.
15 files changed:
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/blenkernel/intern/subsurf_ccg.c
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/mesh/meshtools.c
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/sculpt_paint/paint_vertex_color_utils.c
source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_sculpt_paint.c
source/blender/windowmanager/WM_types.h
source/blender/windowmanager/intern/wm_gesture.c