[Bf-blender-cvs] [f748ef96627] temp-vert-normals-cleanup: Cleanup

[Hans Goudey]

Commit: f748ef9662792d904c05f7dd89bb7b0681eba8a0
Author: Hans Goudey
Date:   Thu Nov 4 23:51:35 2021 -0500
Branches: temp-vert-normals-cleanup
https://developer.blender.org/rBf748ef9662792d904c05f7dd89bb7b0681eba8a0

Cleanup

===================================================================

M	source/blender/modifiers/intern/MOD_mask.cc
M	source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cone.cc
M	source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_grid.cc
M	source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_line.cc

===================================================================

diff --git a/source/blender/modifiers/intern/MOD_mask.cc b/source/blender/modifiers/intern/MOD_mask.cc
index 86b99e1a9be..6aa98e305b7 100644
--- a/source/blender/modifiers/intern/MOD_mask.cc
+++ b/source/blender/modifiers/intern/MOD_mask.cc
@@ -25,7 +25,6 @@
 
 #include "BLI_utildefines.h"
 
-#include "BLI_float3.hh"
 #include "BLI_ghash.h"
 #include "BLI_listbase.h"
 #include "BLI_math.h"
@@ -65,7 +64,6 @@
 #include "BLI_vector.hh"
 
 using blender::Array;
-using blender::float3;
 using blender::IndexRange;
 using blender::ListBaseWrapper;
 using blender::MutableSpan;
diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cone.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cone.cc
index c3d65cdb814..7e2265951d4 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cone.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cone.cc
@@ -745,7 +745,6 @@ static Mesh *create_vertex_mesh()
   /* Returns a mesh with a single vertex at the origin. */
   Mesh *mesh = BKE_mesh_new_nomain(1, 0, 0, 0, 0);
   copy_v3_fl3(mesh->mvert[0].co, 0.0f, 0.0f, 0.0f);
-  BKE_mesh_normals_tag_dirty(mesh);
   return mesh;
 }
 
@@ -788,8 +787,6 @@ Mesh *create_cylinder_or_cone_mesh(const float radius_top,
   calculate_cone_uvs(mesh, config);
   calculate_selection_outputs(mesh, config, attribute_outputs);
 
-  BKE_mesh_normals_tag_dirty(mesh);
-
   return mesh;
 }
 
diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_grid.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_grid.cc
index 478da665cd8..336a20109be 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_grid.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_grid.cc
@@ -105,12 +105,6 @@ Mesh *create_grid_mesh(const int verts_x,
     }
   }
 
-  {
-    /* Fill vertex normal data here since it is trivial and can avoid calculations later. */
-    MutableSpan vert_normals{(float3 *)BKE_mesh_vertex_normals_for_write(mesh), mesh->totvert};
-    vert_normals.fill(float3(0.0f, 0.0f, 1.0f));
-  }
-
   /* Build the horizontal edges in the X direction. */
   const int y_edges_start = 0;
   const short edge_flag = (edges_x == 0 || edges_y == 0) ? ME_LOOSEEDGE :
diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_line.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_line.cc
index 2214947c808..c8270e741fc 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_line.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_line.cc
@@ -118,10 +118,6 @@ Mesh *create_line_mesh(const float3 start, const float3 delta, const int count)
   MutableSpan<MVert> verts{mesh->mvert, mesh->totvert};
   MutableSpan<MEdge> edges{mesh->medge, mesh->totedge};
 
-  /* Fill vertex normal data here since it is trivial and can avoid calculations later. */
-  MutableSpan vert_normals{(float3 *)BKE_mesh_vertex_normals_for_write(mesh), mesh->totvert};
-  vert_normals.fill(delta.normalized());
-
   for (const int i : verts.index_range()) {
     copy_v3_v3(verts[i].co, start + delta * i);
   }