[Bf-blender-cvs] [78aa72d1413] temp-vert-normals-cleanup: Remove a couple unnecessary uses of `BKE_mesh_calc_normals`
Hans Goudey
noreply at git.blender.org
Wed Jan 5 21:51:15 CET 2022
Commit: 78aa72d141300ccdec9c0e30892738a2ad514c3c
Author: Hans Goudey
Date: Wed Jan 5 14:49:49 2022 -0600
Branches: temp-vert-normals-cleanup
https://developer.blender.org/rB78aa72d141300ccdec9c0e30892738a2ad514c3c
Remove a couple unnecessary uses of `BKE_mesh_calc_normals`
===================================================================
M source/blender/editors/object/object_remesh.cc
M source/blender/editors/sculpt_paint/sculpt.c
M source/blender/io/usd/intern/usd_reader_mesh.cc
===================================================================
diff --git a/source/blender/editors/object/object_remesh.cc b/source/blender/editors/object/object_remesh.cc
index 4737de4d8fa..e4103db8e21 100644
--- a/source/blender/editors/object/object_remesh.cc
+++ b/source/blender/editors/object/object_remesh.cc
@@ -168,8 +168,6 @@ static int voxel_remesh_exec(bContext *C, wmOperator *op)
new_mesh = mesh_fixed_poles;
}
- BKE_mesh_calc_normals(new_mesh);
-
if (mesh->flag & ME_REMESH_REPROJECT_VOLUME || mesh->flag & ME_REMESH_REPROJECT_PAINT_MASK ||
mesh->flag & ME_REMESH_REPROJECT_SCULPT_FACE_SETS) {
BKE_mesh_runtime_clear_geometry(mesh);
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index 62a37488a44..70369fa14b2 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -3645,11 +3645,6 @@ void SCULPT_flush_stroke_deform(Sculpt *sd, Object *ob, bool is_proxy_used)
}
MEM_SAFE_FREE(nodes);
-
- /* Modifiers could depend on mesh normals, so we should update them.
- * NOTE: then if sculpting happens on locked key, normals should be re-calculate after applying
- * coords from key-block on base mesh. */
- BKE_mesh_calc_normals(me);
}
else if (ss->shapekey_active) {
sculpt_update_keyblock(ob);
diff --git a/source/blender/io/usd/intern/usd_reader_mesh.cc b/source/blender/io/usd/intern/usd_reader_mesh.cc
index d55a7930b96..1324de40a6e 100644
--- a/source/blender/io/usd/intern/usd_reader_mesh.cc
+++ b/source/blender/io/usd/intern/usd_reader_mesh.cc
@@ -529,14 +529,12 @@ void USDMeshReader::process_normals_vertex_varying(Mesh *mesh)
}
if (normals_.empty()) {
- BKE_mesh_calc_normals(mesh);
return;
}
if (normals_.size() != mesh->totvert) {
std::cerr << "WARNING: vertex varying normals count mismatch for mesh " << prim_path_
<< std::endl;
- BKE_mesh_calc_normals(mesh);
return;
}
More information about the Bf-blender-cvs
mailing list