Merge branch 'master' into blender2.8
authorSybren A. Stüvel <sybren@stuvel.eu>
Wed, 8 Feb 2017 12:10:16 +0000 (13:10 +0100)
committerSybren A. Stüvel <sybren@stuvel.eu>
Wed, 8 Feb 2017 12:10:16 +0000 (13:10 +0100)
commitd4913af84660318047e3404f9766014cd78864ab
tree216516057dc8df5177e4f179392de5a79811ba3f
parentc973e8d2da5cf3f615256269128a07390f8c06a9
parent8cda364d6f2e6e8da454034f19fb959739045813
Merge branch 'master' into blender2.8

# Conflicts:
# source/blender/blenloader/intern/writefile.c
17 files changed:
release/scripts/startup/bl_ui/space_view3d.py
source/blender/alembic/intern/abc_exporter.cc
source/blender/blenkernel/intern/armature.c
source/blender/blenkernel/intern/sound.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/armature/editarmature_sketch.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/object/object_vgroup.c
source/blender/editors/space_view3d/view3d_ruler.c
source/blender/editors/space_view3d/view3d_walk.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_snap.c
source/blender/editors/transform/transform_snap_object.c
source/blender/modifiers/intern/MOD_displace.c
source/blender/modifiers/intern/MOD_explode.c
source/blenderplayer/bad_level_call_stubs/stubs.c