Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 9 Feb 2018 02:56:49 +0000 (13:56 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 9 Feb 2018 02:56:49 +0000 (13:56 +1100)
commit9b9861578d9f9e61ecdb0d0753df5df1e376ecb7
tree34fc6ad7955b7be37ca3120247aa80aab5f7c9e8
parent518d59970df80fa5ad75c2cb5e5093826f175b29
parent8f9386596fb0471c972921e6543b3a0adc3ffb3d
Merge branch 'master' into blender2.8
source/blender/editors/interface/CMakeLists.txt
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/space_sequencer/sequencer_edit.c