blender
/
blender
137
410
Fork 593
Code Issues 6.3k Pull Requests 776 Projects 19 Wiki Activity

Geometry Nodes: use lazy-function directly for switch node #105696

Merged
Jacques Lucke merged 9 commits from JacquesLucke/blender:switch-node-separate-api into main 2023-03-14 14:09:39 +01:00
Conversation 2 Commits 9 Files Changed 5 +4 -4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 15dc530bc4 - Show all commits

8
source/blender/nodes/geometry/nodes/node_geo_switch.cc
View File

@ -193,7 +193,7 @@ class LazyFunctionForSwitchNode : public LazyFunction {
params.set_input_unused(input_to_ignore);
void *value_to_forward = params.try_get_input_data_ptr_or_request(input_to_forward);
if (value_to_forward == nullptr) {
/* True again when the value is available. */
/* Try again when the value is available. */
Hans Goudey commented 2023-03-13 14:38:57 +01:00
Outdated
Review
Copy Link

True again -> Try again?

`True again` -> `Try again`?
return;
}
@ -222,9 +222,9 @@ class LazyFunctionForSwitchNode : public LazyFunction {
GField false_field = value_or_field_type.as_field(false_value_or_field);
GField true_field = value_or_field_type.as_field(true_value_or_field);
GField output_field{std::make_shared<FieldOperation>(
FieldOperation(switch_multi_function,
{std::move(condition), std::move(false_field), std::move(true_field)}))};
GField output_field{FieldOperation::Create(
Hans Goudey commented 2023-03-13 14:40:30 +01:00
Outdated
Review
Copy Link

How about this?

    GField output_field{FieldOperation::Create(
        switch_multi_function,
        {std::move(condition), std::move(false_field), std::move(true_field)})};
How about this? ```c++ GField output_field{FieldOperation::Create( switch_multi_function, {std::move(condition), std::move(false_field), std::move(true_field)})}; ```
switch_multi_function,
{std::move(condition), std::move(false_field), std::move(true_field)})};
void *output_ptr = params.get_output_data_ptr(0);
value_or_field_type.construct_from_field(output_ptr, std::move(output_field));