blender/blender
142
451
Fork 651
Code Issues 6.5k Pull Requests 823 Projects 18 Wiki Activity

GPv3: Cyclical set operator #111904

Merged
Falk David merged 16 commits from casey-bianco-davis/blender:GPv3-cyclical-set-operator into main 2023-10-20 10:12:34 +02:00
Conversation 3 Commits 16 Files Changed 5 +18 -22
3 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 99a73f55ba - Show all commits

3
source/blender/editors/curves/intern/curves_selection.cc
View File

@ -23,8 +23,7 @@
namespace blender::ed::curves {
static IndexMask retrieve_selected_curves(const bke::CurvesGeometry &curves,
IndexMaskMemory &memory)
IndexMask retrieve_selected_curves(const bke::CurvesGeometry &curves, IndexMaskMemory &memory)
{
const IndexRange curves_range = curves.curves_range();
const bke::AttributeAccessor attributes = curves.attributes();

36
source/blender/editors/grease_pencil/intern/grease_pencil_edit.cc
View File

@ -951,39 +951,35 @@ static int grease_pencil_cyclical_set_exec(bContext *C, wmOperator *op)
if (curves.points_num() == 0) {
return;
}
if (!ed::curves::has_anything_selected(curves)) {
return;
}
MutableSpan<bool> cyclic = curves.cyclic_for_write();
const OffsetIndices<int> points_by_curve = curves.points_by_curve();
const VArray<bool> selection = *curves.attributes().lookup_or_default<bool>(
".selection", ATTR_DOMAIN_POINT, true);
threading::parallel_for(curves.curves_range(), 256, [&](const IndexRange range) {
for (const int curve_i : range) {
if (!ed::curves::has_anything_selected(selection, points_by_curve[curve_i])) {
continue;
}
IndexMaskMemory memory;
casey-bianco-davis marked this conversation as resolved Outdated
Falk David commented 2023-10-16 13:50:54 +02:00
Outdated
Review
Copy Link

I think it would be better to use retrieve_selected_curves(const bke::CurvesGeometry &curves, IndexMaskMemory &memory) and then do a IndexMask.foreach_index(...).

I think it would be better to use `retrieve_selected_curves(const bke::CurvesGeometry &curves, IndexMaskMemory &memory)` and then do a `IndexMask.foreach_index(...)`.
const IndexMask curve_selection = ed::curves::retrieve_selected_curves(curves, memory);
if (mode == CyclicalMode::CLOSE) {
cyclic[curve_i] = true;
}
else if (mode == CyclicalMode::OPEN) {
cyclic[curve_i] = false;
}
else if (mode == CyclicalMode::TOGGLE) {
cyclic[curve_i] ^= true;
}
curve_selection.foreach_index([&](const int64_t curve_i) {
if (mode == CyclicalMode::CLOSE) {
cyclic[curve_i] = true;
}
else if (mode == CyclicalMode::OPEN) {
cyclic[curve_i] = false;
}
else if (mode == CyclicalMode::TOGGLE) {
cyclic[curve_i] ^= true;
}
});
if (add_geometry) {
IndexMaskMemory memory;
const OffsetIndices<int> points_by_curve = curves.points_by_curve();
const VArray<bool> selection = *curves.attributes().lookup_or_default<bool>(
".selection", ATTR_DOMAIN_POINT, true);
IndexMaskMemory memory2;
/* Determine which curves are now closed. */
const IndexMask curves_to_close = IndexMask::from_predicate(
curves.curves_range(), GrainSize(512), memory, [&](const int64_t curve_i) {
curves.curves_range(), GrainSize(512), memory2, [&](const int64_t curve_i) {
const bool selected = ed::curves::has_anything_selected(selection,
points_by_curve[curve_i]);
return cyclic[curve_i] && selected;

1
source/blender/editors/include/ED_curves.hh
View File

@ -134,6 +134,7 @@ bool has_anything_selected(const VArray<bool> &varray, IndexRange range_to_check
* Find curves that have any point selected (a selection factor greater than zero),
* or curves that have their own selection factor greater than zero.
*/
IndexMask retrieve_selected_curves(const bke::CurvesGeometry &curves, IndexMaskMemory &memory);
IndexMask retrieve_selected_curves(const Curves &curves_id, IndexMaskMemory &memory);
/**