blender
/
blender
136
426
Fork 613
Code Issues 6.3k Pull Requests 778 Projects 19 Wiki Activity

WIP: Volume grid attribute support in geometry nodes #110044

Closed
Lukas Tönne wants to merge 130 commits from LukasTonne/blender:geometry-nodes-flip into main
pull from: LukasTonne/blender:geometry-nodes-flip
merge into: blender:main

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

6
source/blender/functions/intern/field.cc
View File

@ -123,7 +123,8 @@ static Vector<GGrid> get_volume_field_context_inputs(
const CPPType &type = field_input.cpp_type();
const void *default_value = type.default_value();
grid = GMutableGrid::create(type, default_value);
scope.add_value<GGrid::GridPtr>(std::move(grid.grid_));
/* Move ownership to the resource scope. */
grid = {scope.add_value<GGrid::GridPtr>(std::move(grid.grid_))};
}
field_context_inputs.append(grid);
}
@ -610,6 +611,9 @@ Vector<GGrid> evaluate_volume_fields(ResourceScope &scope,
const int field_input_index = field_tree_info.deduplicated_field_inputs.index_of(
field_input);
const GGrid &grid = field_context_inputs[field_input_index];
/* Input grid needs to exist, otherwise evaluator will try
* computing the input and write into the same field. */
BLI_assert(grid);
r_grids[out_index] = grid;
break;
}