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)
commit542b8da8315eabe4e8817255b82545b3b431c970
tree12f3e4dd5fad220cfa6ff4f904715c0b5fde70a6
parent1b0ecb2f891e256eabea9f71575aea207fbee08f
parent85be72c1cc7317796dcce3ddc6ec2dedd627ff81
Merge branch 'blender-v2.93-release'
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