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

2
source/blender/blenkernel/intern/volume_grids.cc
View File

@ -388,7 +388,7 @@ static AttributeAccessorFunctions get_volume_accessor_functions()
return grids.domain_size(domain);
};
fn.domain_grid_mask =
[](const void *owner, const eAttrDomain domain, const int main_grid) -> volume::GGrid {
[](const void *owner, const eAttrDomain /*domain*/, const int main_grid) -> volume::GGrid {
if (owner == nullptr || main_grid < 0) {
return {nullptr};
}

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

@ -195,7 +195,6 @@ MutableGrid<T> MutableGrid<T>::create(const GGrid &mask,
const typename TreeType::Ptr tree = nullptr;
volume::grid_to_static_type(mask.grid_, [&](auto &typed_mask) {
using MaskGridType = typename std::decay<decltype(typed_mask)>::type;
tree = typename TreeType::Ptr(new TreeType(
typed_mask.grid_->tree(), inactive_value, active_value, openvdb::TopologyCopy{}));
});