Merge branch 'master' into blender2.8
authorJulian Eisel <eiseljulian@gmail.com>
Thu, 2 Mar 2017 18:15:32 +0000 (19:15 +0100)
committerJulian Eisel <eiseljulian@gmail.com>
Thu, 2 Mar 2017 18:15:32 +0000 (19:15 +0100)
commita99495d2914088174ce0900b9360660a41d74c42
tree0f7f2f167ceb7250aebfe76d821de0bb60c8e20f
parent5ce6388f7c2a7fed483ae3ff187063f94f139e94
parent42cb93205c0fc33185e56239d1dc21f0a6230e54
Merge branch 'master' into blender2.8

Conflicts:
source/blender/blenkernel/intern/scene.c
release/scripts/presets/keyconfig/maya.py
source/blender/blenkernel/intern/mesh.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/object/object_modifier.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_manipulator.c