Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sat, 30 Sep 2017 01:00:29 +0000 (11:00 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 30 Sep 2017 01:00:29 +0000 (11:00 +1000)
commit18965905d0fdb2dd546d95ce9eaa4653cd1e3b17
tree5de29a997602e8107f07d49f1ca2b69309e85229
parente3fe8128e41bb7c576f02ba234dfabf5c399cb60
parente3546a5097b1b30a3c694ce0f6b98c2f7e70510c
Merge branch 'master' into blender2.8
12 files changed:
intern/cycles/blender/blender_mesh.cpp
intern/cycles/blender/blender_object.cpp
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/blenkernel/BKE_paint.h
source/blender/blenkernel/intern/paint.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/sculpt_paint/paint_vertex_color_utils.c
source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c
source/blender/editors/sculpt_paint/sculpt.c