Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 2 Jul 2018 16:48:24 +0000 (18:48 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 2 Jul 2018 16:55:24 +0000 (18:55 +0200)
commite35f9f0408a77422f0f7c1593dcabede69820527
tree396535726e3aeab9e0d125eaeb5bc3fcd42ac025
parent12603826eac9bd7399e065987d3c583e2734b0a7
parentdbe1b07e058db33a9e806d8e9808463d563d4aa5
Merge branch 'master' into blender2.8
14 files changed:
source/blender/editors/sculpt_paint/paint_cursor.c
source/blender/editors/sculpt_paint/paint_curve.c
source/blender/editors/sculpt_paint/paint_hide.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/sculpt_paint/paint_image_2d.c
source/blender/editors/sculpt_paint/paint_image_proj.c
source/blender/editors/sculpt_paint/paint_image_undo.c
source/blender/editors/sculpt_paint/paint_intern.h
source/blender/editors/sculpt_paint/paint_mask.c
source/blender/editors/sculpt_paint/paint_ops.c
source/blender/editors/sculpt_paint/paint_stroke.c
source/blender/editors/sculpt_paint/paint_utils.c
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c