From 85f5b22f6417024929dacfbfb96c2b757c59b2a3 Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Tue, 12 Nov 2024 11:57:17 -0500 Subject: [PATCH] Cleanup: Draw: Remove double negative checking mesh extract type --- .../intern/draw_cache_extract_mesh_render_data.cc | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/source/blender/draw/intern/draw_cache_extract_mesh_render_data.cc b/source/blender/draw/intern/draw_cache_extract_mesh_render_data.cc index 4e589abddb9..12a79402f51 100644 --- a/source/blender/draw/intern/draw_cache_extract_mesh_render_data.cc +++ b/source/blender/draw/intern/draw_cache_extract_mesh_render_data.cc @@ -122,12 +122,10 @@ static void mesh_render_data_loose_edges_bm(const MeshRenderData &mr, static void mesh_render_data_loose_geom_build(const MeshRenderData &mr, MeshBufferCache &cache) { - if (mr.extract_type != MeshExtractType::BMesh) { - /* Mesh */ + if (mr.extract_type == MeshExtractType::Mesh) { mesh_render_data_loose_geom_mesh(mr, cache); } else { - /* #BMesh */ BMesh &bm = *mr.bm; mesh_render_data_loose_verts_bm(mr, cache, bm); mesh_render_data_loose_edges_bm(mr, cache, bm); @@ -489,7 +487,7 @@ static bke::MeshNormalDomain bmesh_normals_domain(BMesh *bm) void mesh_render_data_update_corner_normals(MeshRenderData &mr) { - if (mr.extract_type != MeshExtractType::BMesh) { + if (mr.extract_type == MeshExtractType::Mesh) { mr.corner_normals = mr.mesh->corner_normals(); } else { @@ -510,12 +508,12 @@ void mesh_render_data_update_corner_normals(MeshRenderData &mr) void mesh_render_data_update_face_normals(MeshRenderData &mr) { - if (mr.extract_type != MeshExtractType::BMesh) { + if (mr.extract_type == MeshExtractType::Mesh) { /* Eager calculation of face normals can reduce waiting on the lazy cache's lock. */ mr.face_normals = mr.mesh->face_normals(); } else { - /* Use #BMFace.no instead. */ + /* Use #BMFace.no. */ } } @@ -637,8 +635,7 @@ std::unique_ptr mesh_render_data_create(Object &object, } } - if (mr->extract_type != MeshExtractType::BMesh) { - /* Mesh */ + if (mr->extract_type == MeshExtractType::Mesh) { mr->verts_num = mr->mesh->verts_num; mr->edges_num = mr->mesh->edges_num; mr->faces_num = mr->mesh->faces_num; @@ -679,7 +676,6 @@ std::unique_ptr mesh_render_data_create(Object &object, mr->sharp_faces = *attributes.lookup("sharp_face", bke::AttrDomain::Face); } else { - /* #BMesh */ BMesh *bm = mr->bm; mr->verts_num = bm->totvert;