Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 18 Dec 2018 23:28:26 +0000 (10:28 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 18 Dec 2018 23:28:26 +0000 (10:28 +1100)
commitd46d8e831ce0c6a519d60cdcb4c8a5d4f5a88428
tree9c87e6aa0832734a7a4b01e835bacc416138fb00
parent61a816e8ff060016f6e450bb6bbd9df5c93665a6
parent5c3953010dca1f9e05ef4b654d957c5f15e91722
Merge branch 'master' into blender2.8
source/blender/bmesh/tools/bmesh_bevel.c
source/blender/editors/object/object_add.c
source/blender/editors/screen/screen_draw.c
source/blender/editors/transform/transform_conversions.c
source/blender/python/mathutils/mathutils_Matrix.c
source/blender/windowmanager/intern/wm_files.c