Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Sun, 28 May 2017 15:48:59 +0000 (17:48 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Sun, 28 May 2017 15:48:59 +0000 (17:48 +0200)
13 files changed:
1  2 
build_files/cmake/macros.cmake
intern/ghost/intern/GHOST_Context.cpp
intern/opencolorio/CMakeLists.txt
release/scripts/startup/bl_operators/object.py
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/customdata.c
source/blender/blenkernel/intern/mesh_validate.c
source/blender/collada/MeshImporter.cpp
source/blender/editors/mesh/editmesh_tools.c
source/blender/makesrna/intern/rna_object.c
source/blender/python/intern/bpy_app_handlers.c
source/blenderplayer/CMakeLists.txt
tests/python/CMakeLists.txt

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge