1540817576
Boost (removed!) Cython 3.0.11 Expat 2.6.4 GMP 6.3.0 MaterialX 1.39.2 Nanobind 2.1.0 (new, for OpenVDB) NumPy 1.26.4 OpenColorIO 2.4.1 OpenEXR 3.3.2 OpenImageIO 3.0.3.1 OpenVDB 12.0.0 OSL 1.14.3-beta Python 3.11.11 Robinmap 1.3.0 TBB 2021.13.0 TIFF 4.7.0 USD 25.02 libxml2 2.13.5 zlib 1.3.1 Co-authored-by: Brecht Van Lommel <brecht@blender.org> Co-authored-by: Jonas Holzman <jonas@holzman.fr> Co-authored-by: Sebastian Parborg <sebastian@blender.org> Ref #128577 Pull Request: https://projects.blender.org/blender/blender/pulls/134178
45 lines
2.0 KiB
Diff
45 lines
2.0 KiB
Diff
diff --git a/nanovdb/nanovdb/tools/GridBuilder.h b/nanovdb/nanovdb/tools/GridBuilder.h
|
|
index 30385661d0..428215ba65 100644
|
|
--- a/nanovdb/nanovdb/tools/GridBuilder.h
|
|
+++ b/nanovdb/nanovdb/tools/GridBuilder.h
|
|
@@ -1158,7 +1158,7 @@ struct LeafNode
|
|
ValueIterator& operator=(const ValueIterator&) = default;
|
|
ValueType operator*() const { NANOVDB_ASSERT(*this); return mParent->mValues[mPos];}
|
|
Coord getCoord() const { NANOVDB_ASSERT(*this); return mParent->offsetToGlobalCoord(mPos);}
|
|
- bool isActive() const { NANOVDB_ASSERT(*this); return mParent->isActive(mPos);}
|
|
+ bool isActive() const { NANOVDB_ASSERT(*this); return mParent->mValueMask.isOn(mPos);}
|
|
operator bool() const {return mPos < SIZE;}
|
|
ValueIterator& operator++() {++mPos; return *this;}
|
|
ValueIterator operator++(int) {
|
|
diff --git a/openvdb/openvdb/tree/NodeManager.h b/openvdb/openvdb/tree/NodeManager.h
|
|
index 27a3f82012..1023c00748 100644
|
|
--- a/openvdb/openvdb/tree/NodeManager.h
|
|
+++ b/openvdb/openvdb/tree/NodeManager.h
|
|
@@ -328,7 +328,7 @@ class NodeList
|
|
void operator()(const NodeRange& range) const
|
|
{
|
|
for (typename NodeRange::Iterator it = range.begin(); it; ++it) {
|
|
- OpT::template eval(mNodeOp, it);
|
|
+ OpT::eval(mNodeOp, it);
|
|
}
|
|
}
|
|
const NodeOp mNodeOp;
|
|
@@ -348,7 +348,7 @@ class NodeList
|
|
void operator()(const NodeRange& range) const
|
|
{
|
|
for (typename NodeRange::Iterator it = range.begin(); it; ++it) {
|
|
- OpT::template eval(mNodeOp, it);
|
|
+ OpT::eval(mNodeOp, it);
|
|
}
|
|
}
|
|
const NodeOp& mNodeOp;
|
|
@@ -373,7 +373,7 @@ class NodeList
|
|
void operator()(const NodeRange& range)
|
|
{
|
|
for (typename NodeRange::Iterator it = range.begin(); it; ++it) {
|
|
- OpT::template eval(*mNodeOp, it);
|
|
+ OpT::eval(*mNodeOp, it);
|
|
}
|
|
}
|
|
void join(const NodeReducer& other)
|