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)
commit77f2f23a7ebceda3187a2f5ceab79a46a9537574
tree910d6fbd5e5c07cc009f8ada0ec2733183428a96
parent57013c0a39ac75f22eda1a76bb18881fa590b18a
parent6c243b7e4055fbbefaf52d94219bc9a70726eaeb
Merge branch 'master' into blender2.8
source/blender/editors/interface/view2d.c
source/blender/editors/sculpt_paint/sculpt.c