[Bf-blender-cvs] [c1d4105005a] master: Cleanup: Remove unnecessary indentation in cone primitive

Hans Goudey noreply at git.blender.org
Tue Dec 6 21:25:57 CET 2022


Commit: c1d4105005acc06ccff588ad3964ffec66079f16
Author: Hans Goudey
Date:   Tue Dec 6 14:23:26 2022 -0600
Branches: master
https://developer.blender.org/rBc1d4105005acc06ccff588ad3964ffec66079f16

Cleanup: Remove unnecessary indentation in cone primitive

The loop is skipped if there are zero iterations anyway.

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

M	source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cone.cc

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

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 c0ca92bb4b9..e299da86f07 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
@@ -413,37 +413,34 @@ static void calculate_cone_faces(const ConeConfig &config,
   }
 
   /* Quads connect one edge ring to the next one. */
-  if (config.tot_quad_rings > 0) {
-    for (const int i : IndexRange(config.tot_quad_rings)) {
-      const int this_ring_poly_start = rings_poly_start + i * config.circle_segments;
-      const int this_ring_loop_start = rings_loop_start + i * config.circle_segments * 4;
-      const int this_ring_vert_start = config.first_ring_verts_start +
-                                       (i * config.circle_segments);
-      const int next_ring_vert_start = this_ring_vert_start + config.circle_segments;
-
-      const int this_ring_edges_start = config.first_ring_edges_start +
-                                        (i * 2 * config.circle_segments);
-      const int next_ring_edges_start = this_ring_edges_start + (2 * config.circle_segments);
-      const int ring_connections_start = this_ring_edges_start + config.circle_segments;
+  for (const int i : IndexRange(config.tot_quad_rings)) {
+    const int this_ring_poly_start = rings_poly_start + i * config.circle_segments;
+    const int this_ring_loop_start = rings_loop_start + i * config.circle_segments * 4;
+    const int this_ring_vert_start = config.first_ring_verts_start + (i * config.circle_segments);
+    const int next_ring_vert_start = this_ring_vert_start + config.circle_segments;
 
-      for (const int j : IndexRange(config.circle_segments)) {
-        const int loop_start = this_ring_loop_start + j * 4;
-        MPoly &poly = polys[this_ring_poly_start + j];
-        poly.loopstart = loop_start;
-        poly.totloop = 4;
+    const int this_ring_edges_start = config.first_ring_edges_start +
+                                      (i * 2 * config.circle_segments);
+    const int next_ring_edges_start = this_ring_edges_start + (2 * config.circle_segments);
+    const int ring_connections_start = this_ring_edges_start + config.circle_segments;
 
-        loops[loop_start + 0].v = this_ring_vert_start + j;
-        loops[loop_start + 0].e = ring_connections_start + j;
+    for (const int j : IndexRange(config.circle_segments)) {
+      const int loop_start = this_ring_loop_start + j * 4;
+      MPoly &poly = polys[this_ring_poly_start + j];
+      poly.loopstart = loop_start;
+      poly.totloop = 4;
 
-        loops[loop_start + 1].v = next_ring_vert_start + j;
-        loops[loop_start + 1].e = next_ring_edges_start + j;
+      loops[loop_start + 0].v = this_ring_vert_start + j;
+      loops[loop_start + 0].e = ring_connections_start + j;
 
-        loops[loop_start + 2].v = next_ring_vert_start + ((j + 1) % config.circle_segments);
-        loops[loop_start + 2].e = ring_connections_start + ((j + 1) % config.circle_segments);
+      loops[loop_start + 1].v = next_ring_vert_start + j;
+      loops[loop_start + 1].e = next_ring_edges_start + j;
 
-        loops[loop_start + 3].v = this_ring_vert_start + ((j + 1) % config.circle_segments);
-        loops[loop_start + 3].e = this_ring_edges_start + j;
-      }
+      loops[loop_start + 2].v = next_ring_vert_start + ((j + 1) % config.circle_segments);
+      loops[loop_start + 2].e = ring_connections_start + ((j + 1) % config.circle_segments);
+
+      loops[loop_start + 3].v = this_ring_vert_start + ((j + 1) % config.circle_segments);
+      loops[loop_start + 3].e = this_ring_edges_start + j;
     }
   }



More information about the Bf-blender-cvs mailing list