Commit: 3fcac263622b25648601613d214044f8f2e49c1a Author: Kris Date: Fri Apr 2 10:31:20 2021 +0200 Branches: master https://developer.blender.org/rB3fcac263622b25648601613d214044f8f2e49c1a
Fix T86874: Wireframe not drawing for geometry node mesh primitives The following primitives needed ME_EDGEDRAW, ME_EDGERENDER edge flags: * Grid * Circle Set flags on the inside edges for grid and circle triangle fan (mesh primitive nodes) so they are visible and selectable. Reviewed By: HooglyBoogly Differential Revision: https://developer.blender.org/D10878 =================================================================== M release/scripts/addons M source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_circle.cc M source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_grid.cc =================================================================== diff --git a/release/scripts/addons b/release/scripts/addons index 63492d3d033..ebe76f3a7ba 160000 --- a/release/scripts/addons +++ b/release/scripts/addons @@ -1 +1 @@ -Subproject commit 63492d3d0334e1827f611f8fe5a931f3ccbddfc0 +Subproject commit ebe76f3a7ba96b3881567def29b7e2527e018e9a 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 01016ec9b44..aace71d1d40 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 @@ -161,6 +161,7 @@ static Mesh *create_circle_mesh(const float radius, MEdge &edge = edges[verts_num + i]; edge.v1 = verts_num; edge.v2 = i; + edge.flag = ME_EDGEDRAW | ME_EDGERENDER; } } 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 1b9ec91a2f6..d87e6e1ec76 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 @@ -104,6 +104,7 @@ static Mesh *create_grid_mesh(const int verts_x, const int verts_y, const float MEdge &edge = edges[edge_index++]; edge.v1 = vert_index; edge.v2 = vert_index + 1; + edge.flag = ME_EDGEDRAW | ME_EDGERENDER; } } @@ -115,6 +116,7 @@ static Mesh *create_grid_mesh(const int verts_x, const int verts_y, const float MEdge &edge = edges[edge_index++]; edge.v1 = vert_index; edge.v2 = vert_index + verts_y; + edge.flag = ME_EDGEDRAW | ME_EDGERENDER; } } _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
