Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Fri, 1 Jun 2018 15:26:36 +0000 (17:26 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Fri, 1 Jun 2018 15:26:36 +0000 (17:26 +0200)
commite44743736f39246192b49912073a96b4a5cdd2ee
treed01a6c42376d9dbfc3f58965289e10be20def4ee
parente4a727626e34eef20e2b41cc3e26b41db4f360a0
parent051e186d5c61dccfc776b8da9b83c598421be4e7
Merge branch 'master' into blender2.8

 Conflicts:
source/blender/editors/io/io_collada.c
source/blender/editors/object/object_bake.c
source/blender/editors/object/object_edit.c
source/blender/editors/render/render_internal.c
source/blender/makesrna/intern/rna_object_api.c
source/blenderplayer/bad_level_call_stubs/stubs.c
14 files changed:
CMakeLists.txt
build_files/cmake/macros.cmake
build_files/cmake/platform/platform_win32.cmake
intern/cycles/blender/blender_mesh.cpp
source/blender/editors/include/ED_object.h
source/blender/editors/io/io_collada.c
source/blender/editors/object/object_bake_api.c
source/blender/editors/object/object_edit.c
source/blender/editors/space_outliner/outliner_select.c
source/blender/editors/space_sequencer/sequencer_add.c
source/blender/editors/space_sequencer/sequencer_edit.c
source/blender/editors/util/ed_util.c
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_object_api.c