Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 1 Feb 2018 03:02:33 +0000 (14:02 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 1 Feb 2018 03:02:33 +0000 (14:02 +1100)
commite4c9cf7088583353670e9783e0b0aecdf2a0c8df
treea06c9fab7bcf8b51eac7986688ef9291b596f09f
parent7b27b10fa6a6a7c4286f30ba2c625896e7ba3fe6
parent10fec1f153295c9bd60eaa96dfcd09d8cf1b3d91
Merge branch 'master' into blender2.8
release/scripts/startup/bl_ui/__init__.py
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/editors/uvedit/uvedit_ops.c