Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 11 Sep 2017 06:52:53 +0000 (16:52 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 11 Sep 2017 06:52:53 +0000 (16:52 +1000)
1  2 
make.bat
source/blender/editors/sculpt_paint/paint_stroke.c
source/blender/editors/transform/transform_conversions.c
source/blender/python/intern/bpy_rna.c

diff --cc make.bat
Simple merge