blender
/
blender
137
426
Fork 614
Code Issues 6.3k Pull Requests 786 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 +10 -2
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3bc521f246 - Show all commits

12
source/blender/blenlib/intern/volume.cc
View File

@ -37,8 +37,16 @@ struct BoolGridToMask {
GridMask GridMask::from_bools(const GGrid &full_mask, const Grid<bool> &selection)
{
volume::GridMask result = {full_mask.grid_ ? openvdb::MaskGrid::create(*full_mask.grid_) :
nullptr};
volume::GridMask result;
if (!full_mask) {
return {};
}
volume::grid_to_static_type(full_mask.grid_, [&](auto &typed_full_mask) {
openvdb::MaskTree::Ptr result_tree = std::make_shared<openvdb::MaskTree>(
typed_full_mask.constTree(), false, true, openvdb::TopologyCopy{});
result = {openvdb::MaskGrid::create(result_tree)};
});
if (selection) {
BoolGridToMask op{selection.grid_->getConstAccessor()};
openvdb::tools::foreach (result.grid_->beginValueOn(), op);