Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 13 Mar 2018 15:15:37 +0000 (02:15 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 13 Mar 2018 15:15:37 +0000 (02:15 +1100)
commit585208e0e911c985a062dd74b6cc689e4fb63ef8
treed390abe6663c5619d34dc929d68a24775d24d7fb
parentc99c45a1e3563f4b6dad6eb9498a5ae0f386b93d
parentbe25a0faa7ff0f64e9d75f5f48c042bb8595f142
Merge branch 'master' into blender2.8
20 files changed:
source/blender/blenkernel/BKE_node.h
source/blender/blenkernel/intern/mesh_evaluate.c
source/blender/bmesh/intern/bmesh_mesh.c
source/blender/editors/armature/armature_naming.c
source/blender/editors/include/ED_mesh.h
source/blender/editors/interface/interface_icons.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/mesh/editmesh_utils.c
source/blender/editors/mesh/mesh_data.c
source/blender/editors/object/object_edit.c
source/blender/editors/object/object_hook.c
source/blender/editors/object/object_relations.c
source/blender/editors/space_view3d/view3d_camera_control.c
source/blender/editors/transform/transform_snap_object.c
source/blender/editors/util/editmode_undo.c
source/blender/makesdna/intern/dna_genfile.c
source/blender/makesrna/intern/rna_object.c
source/blender/windowmanager/intern/wm_operators.c
source/blender/windowmanager/intern/wm_window.c
source/blenderplayer/bad_level_call_stubs/stubs.c