Misc. minor fixes

AcademySoftwareFoundation · Apr 2, 2018 · cd1f16d · cd1f16d
1 parent 72db118
commit cd1f16d
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 40 deletions.
diff --git a/openvdb/CHANGES b/openvdb/CHANGES
@@ -47,6 +47,8 @@ Version 5.1.0 - In development
     - Grid transforms are now more aggressively simplified, making it
       less likely to produce nonuniform voxels erroneously.
       [Contributed by Jeff Lait]
+    - Fixed a bug when copying and pasting a Create SOP that could cause
+      the Voxel Size toggle to change state.
     - Added a houdini_utils::OpFactory::setVerb() method to register
       compilable SOPs.
     - Made SOP_NodeVDB::cookMySop() final (that is, non-overridable)

diff --git a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt
@@ -123,7 +123,7 @@ INCLUDE_DIRECTORIES ( . ) # So they can simulate referencing installed headers
 
 IF (WIN32)
   # Because of implicit linking!
-  LINK_DIRECTORIES ( SYSTEM ${Boost_LIBRARY_DIR} )
+  LINK_DIRECTORIES ( ${Boost_LIBRARY_DIR} )
 ENDIF ()
 
 INCLUDE_DIRECTORIES ( SYSTEM ${BLOSC_INCLUDE_DIR} )

diff --git a/openvdb/doc/changes.txt b/openvdb/doc/changes.txt
@@ -60,6 +60,8 @@ Houdini:
 - Grid transforms are now more aggressively simplified, making it less likely
   to produce nonuniform voxels erroneously.
   <I>[Contributed by Jeff&nbsp;Lait]</I>
+- Fixed a bug when copying and pasting a Create&nbsp;SOP that could cause
+  the Voxel&nbsp;Size toggle to change state.
 - Added a @b houdini_utils::OpFactory::setVerb method to register
   <A HREF="http://www.sidefx.com/docs/houdini/model/compile">
   compilable</A>&nbsp;SOPs.

diff --git a/openvdb/points/AttributeArray.h b/openvdb/points/AttributeArray.h
@@ -908,7 +908,7 @@ TypedAttributeArray<ValueType_, Codec_>::TypedAttributeArray(const TypedAttribut
 
 
 template<typename ValueType_, typename Codec_>
-typename TypedAttributeArray<ValueType_, Codec_>::TypedAttributeArray&
+TypedAttributeArray<ValueType_, Codec_>&
 TypedAttributeArray<ValueType_, Codec_>::operator=(const TypedAttributeArray& rhs)
 {
     if (&rhs != this) {

diff --git a/openvdb/points/IndexFilter.h b/openvdb/points/IndexFilter.h
@@ -114,7 +114,7 @@ class MultiGroupFilter
         for (const auto& name : names) {
             try {
                 indices.emplace_back(attributeSet.groupIndex(name));
-            } catch (LookupError) {
+            } catch (LookupError&) {
                 // silently drop group names that don't exist
             }
         }

diff --git a/openvdb/points/PointAttribute.h b/openvdb/points/PointAttribute.h
@@ -53,7 +53,10 @@ namespace points {
 namespace point_attribute_internal {
 
 template <typename ValueType>
-inline ValueType defaultValue() { return zeroVal<ValueType>(); }
+struct Default
+{
+    static inline ValueType value() { return zeroVal<ValueType>(); }
+};
 
 } // namespace point_attribute_internal
 
@@ -93,7 +96,7 @@ template <typename ValueType, typename CodecType, typename PointDataTree>
 inline void appendAttribute(PointDataTree& tree,
                             const std::string& name,
                             const ValueType& uniformValue =
-                                point_attribute_internal::defaultValue<ValueType>(),
+                                point_attribute_internal::Default<ValueType>::value(),
                             const Index strideOrTotalSize = 1,
                             const bool constantStride = true,
                             Metadata::Ptr metaDefaultValue = Metadata::Ptr(),
@@ -114,7 +117,7 @@ template <typename ValueType, typename PointDataTree>
 inline void appendAttribute(PointDataTree& tree,
                             const std::string& name,
                             const ValueType& uniformValue =
-                                point_attribute_internal::defaultValue<ValueType>(),
+                                point_attribute_internal::Default<ValueType>::value(),
                             const Index strideOrTotalSize = 1,
                             const bool constantStride = true,
                             Metadata::Ptr metaDefaultValue = Metadata::Ptr(),
@@ -130,7 +133,7 @@ template <typename ValueType, typename PointDataTree>
 inline void collapseAttribute(  PointDataTree& tree,
                                 const Name& name,
                                 const ValueType& uniformValue =
-                                    point_attribute_internal::defaultValue<ValueType>());
+                                    point_attribute_internal::Default<ValueType>::value());
 
 /// @brief Drops attributes from the VDB tree.
 ///
@@ -527,13 +530,13 @@ inline void appendAttribute(PointDataTree& tree,
         "ValueType must not be derived from AttributeArray");
 
     using point_attribute_internal::AttributeTypeConversion;
-    using point_attribute_internal::defaultValue;
+    using point_attribute_internal::Default;
     using point_attribute_internal::MetadataStorage;
 
     appendAttribute(tree, name, AttributeTypeConversion<ValueType, CodecType>::type(),
         strideOrTotalSize, constantStride, metaDefaultValue, hidden, transient);
 
-    if (!math::isExactlyEqual(uniformValue, defaultValue<ValueType>())) {
+    if (!math::isExactlyEqual(uniformValue, Default<ValueType>::value())) {
         MetadataStorage<PointDataTree, ValueType>::add(tree, uniformValue);
         collapseAttribute<ValueType>(tree, name, uniformValue);
     }

diff --git a/openvdb/python/pyOpenVDBModule.cc b/openvdb/python/pyOpenVDBModule.cc
@@ -617,21 +617,21 @@ struct VecTypeDescr
     {
         return
             "The type of a vector determines how transforms are applied to it.\n"
-            "- INVARIANT:\n"
-            "    does not transform (e.g., tuple, uvw, color)\n"
-            "- COVARIANT:\n"
-            "    apply inverse-transpose transformation with w = 0\n"
-            "    and ignore translation (e.g., gradient/normal)\n"
-            "- COVARIANT_NORMALIZE:\n"
-            "    apply inverse-transpose transformation with w = 0\n"
-            "    and ignore translation, vectors are renormalized\n"
-            "    (e.g., unit normal)\n"
-            "- CONTRAVARIANT_RELATIVE:\n"
-            "    apply \"regular\" transformation with w = 0 and ignore\n"
-            "    translation (e.g., displacement, velocity, acceleration)\n"
-            "- CONTRAVARIANT_ABSOLUTE:\n"
-            "    apply \"regular\" transformation with w = 1 so that\n"
-            "    vector translates (e.g., position)";
+            "  - INVARIANT:\n"
+            "      does not transform (e.g., tuple, uvw, color)\n"
+            "  - COVARIANT:\n"
+            "      apply inverse-transpose transformation with w = 0\n"
+            "      and ignore translation (e.g., gradient/normal)\n"
+            "  - COVARIANT_NORMALIZE:\n"
+            "      apply inverse-transpose transformation with w = 0\n"
+            "      and ignore translation, vectors are renormalized\n"
+            "      (e.g., unit normal)\n"
+            "  - CONTRAVARIANT_RELATIVE:\n"
+            "      apply \"regular\" transformation with w = 0 and ignore\n"
+            "      translation (e.g., displacement, velocity, acceleration)\n"
+            "  - CONTRAVARIANT_ABSOLUTE:\n"
+            "      apply \"regular\" transformation with w = 1 so that\n"
+            "      vector translates (e.g., position)\n";
     }
     static pyutil::CStringPair item(int i)
     {

diff --git a/openvdb/tools/ValueTransformer.h b/openvdb/tools/ValueTransformer.h
@@ -646,17 +646,9 @@ class OpAccumulator
     OpAccumulator(const IterT& iter, OpT& op):
         mIsRoot(true),
         mIter(iter),
-////
-        //mOp(&op),
-        //mOrigOp(new OpT(op))
-mOp(NULL),
-mOrigOp(NULL)
-{
-    mOp = &op;
-    mOrigOp = new OpT(op);
-}
-    //{}
-////
+        mOp(&op),
+        mOrigOp(new OpT(op))
+    {}
 
     // When splitting this task, give the subtask a copy of the original functor,
     // not of this task's functor, which might have been modified arbitrarily.
@@ -687,10 +679,7 @@ mOrigOp(NULL)
     const bool mIsRoot;
     const IterT mIter;
     OpT* mOp; // pointer to original functor, which might get modified
-////
-    //OpT const * const mOrigOp; // const copy of original functor
-OpT const * mOrigOp; // const copy of original functor
-////
+    OpT const * const mOrigOp; // const copy of original functor
 }; // class OpAccumulator
 
 } // namespace valxform

diff --git a/openvdb_houdini/houdini/SOP_OpenVDB_Create.cc b/openvdb_houdini/houdini/SOP_OpenVDB_Create.cc
@@ -697,7 +697,8 @@ void
 SOP_OpenVDB_Create::resolveObsoleteParms(PRM_ParmList* obsoleteParms)
 {
     if (!obsoleteParms) return;
-    if (nullptr != obsoleteParms->getParmPtr("matchVoxelSize")) {
+    PRM_Parm* parm = obsoleteParms->getParmPtr("matchVoxelSize");
+    if (parm && !parm->isFactoryDefault()) {
         const bool matchVoxelSize = obsoleteParms->evalInt("matchVoxelSize", 0, /*time=*/0.0);
         setInt("useVoxelSize", 0, 0.0, !matchVoxelSize);
     }