Merge branch 'blender-v2.93-release'
authorBrecht Van Lommel <brecht@blender.org>
Mon, 17 May 2021 18:18:39 +0000 (20:18 +0200)
committerBrecht Van Lommel <brecht@blender.org>
Mon, 17 May 2021 18:18:39 +0000 (20:18 +0200)
1  2 
intern/cycles/blender/blender_object.cpp
source/blender/blenkernel/BKE_mesh.h
source/blender/blenkernel/intern/DerivedMesh.cc
source/blender/blenkernel/intern/mesh_convert.c
source/blender/blenkernel/intern/object.c
source/blender/python/bmesh/bmesh_py_types.c

Simple merge