[Bf-blender-cvs] [801d7b4921d] master: Fix T95738: wrong "Bottom" selection for cone without base

[Jacques Lucke]

Commit: 801d7b4921dce55d1fb0d2989935408db1e1691e
Author: Jacques Lucke
Date:   Wed Mar 9 10:34:59 2022 +0100
Branches: master
https://developer.blender.org/rB801d7b4921dce55d1fb0d2989935408db1e1691e

Fix T95738: wrong "Bottom" selection for cone without base

Original patch by @lone_noel with changes by me.

Differential Revision: https://developer.blender.org/D14102

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

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 d84a2e73172..b882d4bdf09 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
@@ -510,11 +510,11 @@ static void calculate_selection_outputs(Mesh *mesh,
     if (config.bottom_is_point) {
       selection[config.last_vert] = true;
     }
+    else if (face) {
+      selection.slice(config.bottom_faces_start, config.bottom_faces_len).fill(true);
+    }
     else {
-      selection
-          .slice(config.bottom_faces_start,
-                 face ? config.bottom_faces_len : config.circle_segments)
-          .fill(true);
+      selection.slice(config.last_ring_verts_start + 1, config.circle_segments).fill(true);
     }
     attribute.save();
   }