main sync #3

Merged
Patrick Busch merged 318 commits from blender/blender:main into main 2023-03-17 15:52:21 +01:00
Showing only changes of commit 2daf6c69be - Show all commits

View File

@ -156,6 +156,10 @@ static Mesh *generate_bounding_box_mesh(const Mesh *org_mesh)
} }
Mesh *result = geometry::create_cuboid_mesh(max - min, 2, 2, 2); Mesh *result = geometry::create_cuboid_mesh(max - min, 2, 2, 2);
if (org_mesh->mat) {
result->mat = static_cast<Material **>(MEM_dupallocN(org_mesh->mat));
result->totcol = org_mesh->totcol;
}
BKE_mesh_translate(result, math::midpoint(min, max), false); BKE_mesh_translate(result, math::midpoint(min, max), false);
return result; return result;