[Bf-blender-cvs] [084180874cc] master: Fix: Circle mesh primitive outer edges do not render

[Mattias Fredriksson]

Commit: 084180874ccf4d961cdc956131eb397c7181527c
Author: Mattias Fredriksson
Date:   Sun Aug 29 16:30:17 2021 -0500
Branches: master
https://developer.blender.org/rB084180874ccf4d961cdc956131eb397c7181527c

Fix: Circle mesh primitive outer edges do not render

The outer edges created om the circle mesh primitive node
weren't marked with the flags that makes them show in wireframe
mode.

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

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

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

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

diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_circle.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_circle.cc
index 131f9548b40..b0bb547eb45 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_circle.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_circle.cc
@@ -143,18 +143,14 @@ static Mesh *create_circle_mesh(const float radius,
   }
 
   /* Create outer edges. */
+  const short edge_flag = (fill_type == GEO_NODE_MESH_CIRCLE_FILL_NONE) ?
+                              ME_LOOSEEDGE :
+                              (ME_EDGEDRAW | ME_EDGERENDER); /* NGON or TRIANGLE_FAN */
   for (const int i : IndexRange(verts_num)) {
     MEdge &edge = edges[i];
     edge.v1 = i;
     edge.v2 = (i + 1) % verts_num;
-  }
-
-  /* Set loose edge flags. */
-  if (fill_type == GEO_NODE_MESH_CIRCLE_FILL_NONE) {
-    for (const int i : IndexRange(verts_num)) {
-      MEdge &edge = edges[i];
-      edge.flag |= ME_LOOSEEDGE;
-    }
+    edge.flag = edge_flag;
   }
 
   /* Create triangle fan edges. */