blender
/
blender
137
409
Fork 592
Code Issues 6.3k Pull Requests 776 Projects 19 Wiki Activity

Curves: Add support for proportional editing #104620

Closed
Falk David wants to merge 15 commits from filedescriptor:curves-proportional-editing into blender-v3.5-release
pull from: filedescriptor:curves-proportional-editing
merge into: blender:blender-v3.5-release

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 2 Commits 15 Files Changed 4 +2 -3
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 23529b64e0 - Show all commits

5
source/blender/editors/transform/transform_convert_curves.cc
View File

@ -127,8 +127,7 @@ static void createTransCurvesVerts(bContext * /*C*/, TransInfo *t)
}
}
const Span<float3> positions_curve = positions.slice(points);
Array<float> closest_distances(positions_curve.size(), FLT_MAX);
Array<float> closest_distances(points.size(), FLT_MAX);
filedescriptor marked this conversation as resolved
Hans Goudey commented 2023-02-17 20:05:22 +01:00
Review
Copy Link

This array makes things a bit more readable, but it isn't really necessary considering all the data will go into TransData.dist right after. It might be worth skipping the array, since this will be an allocation and free for every single curve.

This array makes things a bit more readable, but it isn't really necessary considering all the data will go into `TransData.dist` right after. It might be worth skipping the array, since this will be an allocation and free for every single curve.
Falk David commented 2023-02-18 15:44:07 +01:00
Review
Copy Link

I am not sure how I would rewrite the code to not use an array in this case. The td->dist values are not sequential, so I can't write to them directly. But the implementation needs some container that I can build the InplacePriorityQueue on top of.

I am not sure how I would rewrite the code to not use an array in this case. The `td->dist` values are not sequential, so I can't write to them directly. But the implementation needs some container that I can build the `InplacePriorityQueue` on top of.
Hans Goudey commented 2023-02-18 16:40:01 +01:00
Review
Copy Link

Ah right! That's totally fine, it was just a thought.

Ah right! That's totally fine, it was just a thought.
for (const int i : IndexRange(points.size())) {
const int point_i = points[i];
@ -153,7 +152,7 @@ static void createTransCurvesVerts(bContext * /*C*/, TransInfo *t)
if (use_connected_only) {
calculate_curve_point_distances_for_proportional_editing(
positions_curve, closest_distances.as_mutable_span());
positions.slice(points), closest_distances.as_mutable_span());
for (const int i : IndexRange(points.size())) {
TransData &td = tc.data[points[i]];
td.dist = closest_distances[i];