Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Fri, 17 Feb 2017 19:03:55 +0000 (20:03 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Fri, 17 Feb 2017 19:03:55 +0000 (20:03 +0100)
commit322b1d3187fc5b3e82ebf8b13a675e3132059ef4
tree50a7091fc310cd503e3878a9b9f7a4734f9fcdc7
parentcb36dbe606d9e5bef32a756a60b1d77a92dccfa8
parent6f1493f68fe01a8e951cf6c4e50103e20b85d513
Merge branch 'master' into blender2.8

Conflicts:
source/blender/editors/animation/anim_draw.c
16 files changed:
CMakeLists.txt
release/scripts/startup/bl_ui/space_view3d.py
source/blender/alembic/intern/abc_exporter.cc
source/blender/blenkernel/BKE_object.h
source/blender/blenkernel/intern/mesh.c
source/blender/blenkernel/intern/object.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/animation/anim_draw.c
source/blender/editors/curve/editcurve.c
source/blender/editors/interface/interface_widgets.c
source/blender/editors/space_view3d/space_view3d.c
source/blender/editors/transform/transform_snap_object.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_scene.c
tests/python/CMakeLists.txt