Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKris <Metricity>2021-04-02 11:31:20 +0300
committerDalai Felinto <dalai@blender.org>2021-04-02 11:43:43 +0300
commit3fcac263622b25648601613d214044f8f2e49c1a (patch)
treee0e97620044f2ab76a61aeb7d3b8c74e9e9eb527
parent6578f9d1e9981f2c52824654fb6ad267ba8ca3b4 (diff)
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/addons0
-rw-r--r--source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_circle.cc1
-rw-r--r--source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_grid.cc2
3 files changed, 3 insertions, 0 deletions
diff --git a/release/scripts/addons b/release/scripts/addons
-Subproject 63492d3d0334e1827f611f8fe5a931f3ccbddfc
+Subproject ebe76f3a7ba96b3881567def29b7e2527e018e9
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;
}
}