Apply neighbour stencil to erosion as well.

Fix tabs.

Signed-off-by: jlait <[email protected]>

Author: jmlait

openvdb_houdini/openvdb_houdini/SOP_OpenVDB_Activate.cc

@@ -237,14 +237,14 @@ operation or setting of values.)"));
     Specifies which nearby voxels are considered neighbors for expansion.
 */
     parms.add(hutil::ParmFactory(PRM_STRING, "expansionpattern", "Expansion Pattern")
-	.setChoiceListItems(PRM_CHOICELIST_SINGLE, {
-	    "face", "Plus",
-	    "faceedge", "Diamond",
-	    "faceedgevertex", "Box"
-	})
-	.setDefault("face")
-	.setTooltip("Set pattern used to identify neighbor voxels for expansion.")
-	.setDocumentation(
+        .setChoiceListItems(PRM_CHOICELIST_SINGLE, {
+            "face", "Plus",
+            "faceedge", "Diamond",
+            "faceedgevertex", "Box"
+        })
+        .setDefault("face")
+        .setTooltip("Set pattern used to identify neighbor voxels for expansion.")
+        .setDocumentation(
 R"(Specifies which nearby voxels are considered neighbors for expansion.)"));
 
     parms.addFolder("Reference");
@@ -511,9 +511,9 @@ sopDilateVoxels(GridType& grid, exint count, openvdb::tools::NearestNeighbors nn
 
 template <typename GridType>
 static void
-sopErodeVoxels(GridType& grid, exint count)
+sopErodeVoxels(GridType& grid, exint count, openvdb::tools::NearestNeighbors nn)
 {
-    openvdb::tools::erodeActiveValues(grid.tree(), static_cast<int>(count));
+    openvdb::tools::erodeActiveValues(grid.tree(), static_cast<int>(count), nn);
     if (grid.getGridClass() == openvdb::GRID_LEVEL_SET) {
         openvdb::tools::pruneLevelSet(grid.tree());
     }
@@ -687,17 +687,19 @@ SOP_VDBActivate::Cache::cookVDBSop(OP_Context &context)
                                             evalFloat("expanddist", 0, t),
                                             vdb->getVoxelDiameter())));
 
+                    NearestNeighbors nn = NN_FACE;
+                    const auto str = evalStdString("expansionpattern", t);
+                    if (str == "faceedge")
+                        nn = NN_FACE_EDGE;
+                    else if (str == "faceedgevertex")
+                        nn = NN_FACE_EDGE_VERTEX;
+
                     exint maxdilate = SYSmax(dilatevoxels, dilatedist);
                     if (maxdilate > 0)
                     {
                         if (boss->opInterrupt())
                             break;
-			NearestNeighbors nn = NN_FACE;
-			const auto str = evalStdString("expansionpattern", t);
-			if (str == "faceedge")
-			    nn = NN_FACE_EDGE;
-			else if (str == "faceedgevertex")
-			    nn = NN_FACE_EDGE_VERTEX;
+
                         UTvdbCallAllTopology(vdb->getStorageType(),
                                          sopDilateVoxels,
                                          vdb->getGrid(), maxdilate, nn);
@@ -710,7 +712,7 @@ SOP_VDBActivate::Cache::cookVDBSop(OP_Context &context)
                             break;
                         UTvdbCallAllTopology(vdb->getStorageType(),
                                          sopErodeVoxels,
-                                         vdb->getGrid(), -mindilate);
+                                         vdb->getGrid(), -mindilate, nn);
                     }
                     if (mindilate < 0 && maxdilate > 0)
                     {