[Bf-blender-cvs] [95ecd5804d6] geometry-nodes-mesh-primitives: Fix index calculations

[Hans Goudey]

Commit: 95ecd5804d6a15f3a2e945574d5bc2227269c949
Author: Hans Goudey
Date:   Thu Feb 25 18:02:41 2021 -0600
Branches: geometry-nodes-mesh-primitives
https://developer.blender.org/rB95ecd5804d6a15f3a2e945574d5bc2227269c949

Fix index calculations

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

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

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

diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_uv_sphere.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_uv_sphere.cc
index 518e4673662..c7f301bd1fc 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_uv_sphere.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_uv_sphere.cc
@@ -187,7 +187,7 @@ static void calculate_faces(MutableSpan<MLoop> loops,
 
   int ring_vert_index_start = 1;
   int ring_edge_index_start = segments;
-  for (const int ring : IndexRange(rings - 2)) {
+  for (const int UNUSED(ring) : IndexRange(rings - 2)) {
     const int next_ring_vert_index_start = ring_vert_index_start + segments;
 
     const int next_ring_edge_index_start = ring_edge_index_start + segments * 2;
@@ -226,11 +226,11 @@ static void calculate_faces(MutableSpan<MLoop> loops,
       BLI_assert(ELEM(loop_a.v, edges[loop_d.e].v1, edges[loop_d.e].v2));
     }
     ring_vert_index_start += segments;
-    ring_edge_index_start += segments;
+    ring_edge_index_start += segments * 2;
   }
 
   /* Add the triangles connected to the bottom vertex. */
-  const int last_edge_ring_start = segments * rings;
+  const int last_edge_ring_start = segments * (rings - 2) * 2 + segments;
   const int bottom_edge_fan_start = last_edge_ring_start + segments;
   const int last_vert_index = vert_total(segments, rings) - 1;
   const int last_vert_ring_start = last_vert_index - segments;