Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Thu, 15 Jun 2017 13:54:11 +0000 (15:54 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Thu, 15 Jun 2017 13:54:11 +0000 (15:54 +0200)
commita35e733ff18fcdf5b57937cd85f9bcd6aec236b0
tree30a1508ee4a7b6ba4df705721fb2133b70a20798
parent60a36f202837037b6f6d31d4d067ec783f53d0ba
parent880e96dd667aedea17353803bcc5721f3cc34d50
Merge branch 'master' into blender2.8

Conflicts:
source/blender/collada/MeshImporter.cpp
source/blender/editors/object/object_add.c
source/blender/editors/screen/screen_edit.c
source/blender/blenkernel/intern/mesh.c
source/blender/blenkernel/intern/sequencer.c
source/blender/blenloader/intern/versioning_defaults.c
source/blender/collada/DocumentImporter.cpp
source/blender/collada/MeshImporter.cpp
source/blender/editors/object/object_add.c
source/blender/editors/object/object_group.c
source/blender/editors/space_outliner/outliner_tools.c