Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/blender-v3.1-release'
Browse files Browse the repository at this point in the history
  • Loading branch information
diekev committed Feb 15, 2022
2 parents 4782713 + 53fe4f6 commit e272bdc
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions source/blender/blenkernel/intern/mesh_convert.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1041,7 +1041,7 @@ static Mesh *mesh_new_from_mesh(Object *object, Mesh *mesh)
BKE_mesh_wrapper_ensure_mdata(mesh);
}
else {
BKE_mesh_wrapper_ensure_subdivision(object, mesh);
mesh = BKE_mesh_wrapper_ensure_subdivision(object, mesh);
}

Mesh *mesh_result = (Mesh *)BKE_id_copy_ex(
Expand Down Expand Up @@ -1079,8 +1079,7 @@ static Mesh *mesh_new_from_mesh_object_with_layers(Depsgraph *depsgraph,
mask.pmask |= CD_MASK_ORIGINDEX;
}
Mesh *result = mesh_create_eval_final(depsgraph, scene, &object_for_eval, &mask);
BKE_mesh_wrapper_ensure_subdivision(object, result);
return result;
return BKE_mesh_wrapper_ensure_subdivision(object, result);
}

static Mesh *mesh_new_from_mesh_object(Depsgraph *depsgraph,
Expand Down

0 comments on commit e272bdc

Please sign in to comment.