[Bf-blender-cvs] [39292be4cfe] sculpt-dev: Sculpt-dev: fix another crash
Joseph Eagar
noreply at git.blender.org
Fri Nov 19 16:08:11 CET 2021
Commit: 39292be4cfe74b57343f34c3bcab811a8a6a4c73
Author: Joseph Eagar
Date: Fri Nov 19 07:08:03 2021 -0800
Branches: sculpt-dev
https://developer.blender.org/rB39292be4cfe74b57343f34c3bcab811a8a6a4c73
Sculpt-dev: fix another crash
===================================================================
M source/blender/blenkernel/intern/mesh.cc
===================================================================
diff --git a/source/blender/blenkernel/intern/mesh.cc b/source/blender/blenkernel/intern/mesh.cc
index b6987341acb..60754a83b45 100644
--- a/source/blender/blenkernel/intern/mesh.cc
+++ b/source/blender/blenkernel/intern/mesh.cc
@@ -1164,7 +1164,10 @@ Mesh *BKE_mesh_from_bmesh_nomain(BMesh *bm,
Mesh *mesh = (Mesh *)BKE_id_new_nomain(ID_ME, nullptr);
BM_mesh_bm_to_me(nullptr, nullptr, bm, mesh, params);
- BKE_mesh_copy_parameters_for_eval(mesh, me_settings);
+
+ if (me_settings) {
+ BKE_mesh_copy_parameters_for_eval(mesh, me_settings);
+ }
return mesh;
}
@@ -1175,7 +1178,11 @@ Mesh *BKE_mesh_from_bmesh_for_eval_nomain(BMesh *bm,
{
Mesh *mesh = (Mesh *)BKE_id_new_nomain(ID_ME, nullptr);
BM_mesh_bm_to_me_for_eval(bm, mesh, cd_mask_extra);
- BKE_mesh_copy_parameters_for_eval(mesh, me_settings);
+
+ if (me_settings) {
+ BKE_mesh_copy_parameters_for_eval(mesh, me_settings);
+ }
+
return mesh;
}
More information about the Bf-blender-cvs
mailing list