Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 18 Dec 2017 15:19:12 +0000 (16:19 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 18 Dec 2017 15:19:12 +0000 (16:19 +0100)
1  2 
source/blender/blenkernel/BKE_paint.h
source/blender/blenkernel/intern/paint.c
source/blender/editors/sculpt_paint/paint_stroke.c
source/blender/modifiers/intern/MOD_surfacedeform.c

Simple merge