Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 7 May 2018 12:29:54 +0000 (14:29 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 7 May 2018 12:29:54 +0000 (14:29 +0200)
1  2 
source/blender/editors/interface/view2d.c
source/blender/editors/sculpt_paint/sculpt.c