blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 762 Projects 19 Wiki Activity

Fix T92850: Curve to mesh incorrect for single point profiles 

For single point splines that weren't at the origin, the results were
incorrect. Now take into account the tilt, radius, etc. just like the
general case.
This commit is contained in:
Hans Goudey 2021-11-05 09:52:25 -05:00
parent e65230f0c0
commit 616594fcb1
Notes: blender-bot 2023-02-14 03:00:45 +01:00 
Referenced by issue #92850, Geometry nodes Curve Profile (node: Curve to Mesh) Translates curve insted of giving Profile if a Curve with no conected Points is used as Profile
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source/blender/blenkernel/intern/curve_to_mesh_convert.cc
View File

@ -58,9 +58,8 @@ static void vert_extrude_to_mesh_data(const Spline &spline,
const int vert_offset,
const int edge_offset)
{
Span<float3> positions = spline.evaluated_positions();
for (const int i : IndexRange(positions.size() - 1)) {
const int eval_size = spline.evaluated_points_size();
for (const int i : IndexRange(eval_size - 1)) {
MEdge &edge = r_edges[edge_offset + i];
edge.v1 = vert_offset + i;
edge.v2 = vert_offset + i + 1;
@ -70,13 +69,21 @@ static void vert_extrude_to_mesh_data(const Spline &spline,
if (spline.is_cyclic() && spline.evaluated_edges_size() > 1) {
MEdge &edge = r_edges[edge_offset + spline.evaluated_edges_size() - 1];
edge.v1 = vert_offset;
edge.v2 = vert_offset + positions.size() - 1;
edge.v2 = vert_offset + eval_size - 1;
edge.flag = ME_LOOSEEDGE;
}
for (const int i : positions.index_range()) {
Span<float3> positions = spline.evaluated_positions();
Span<float3> tangents = spline.evaluated_tangents();
Span<float3> normals = spline.evaluated_normals();
GVArray_Typed<float> radii = spline.interpolate_to_evaluated(spline.radii());
for (const int i : IndexRange(eval_size)) {
float4x4 point_matrix = float4x4::from_normalized_axis_data(
positions[i], normals[i], tangents[i]);
point_matrix.apply_scale(radii[i]);
MVert &vert = r_verts[vert_offset + i];
copy_v3_v3(vert.co, positions[i] + profile_vert);
copy_v3_v3(vert.co, point_matrix * profile_vert);
}
}