Merge pull request #1085 from sideeffects/send_upstream_vdbcombinefix

Fix a bug that crept in when we switched dispatchers.

Author: jmlait

openvdb_houdini/openvdb_houdini/SOP_OpenVDB_Combine.cc

@@ -1524,9 +1524,7 @@ SOP_OpenVDB_Combine::Cache::combineGrids(
     compOp.interrupt = hvdb::Interrupter();
 
     int success = false;
-    if (needA || UTvdbGetGridType(*aGrid) == UTvdbGetGridType(*bGrid)) {
-        success = aGrid->apply<hvdb::VolumeGridTypes>(compOp);
-    }
+    success = (needA ? aGrid : bGrid)->apply<hvdb::VolumeGridTypes>(compOp);
     if (!success || !compOp.outGrid) {
         std::ostringstream ostr;
         if (aGrid->type() == bGrid->type()) {

pendingchanges/vdbcombinefix.txt

@@ -0,0 +1,3 @@
+Houdini:
+    Fix crash in VDB Combine in Copy B mode if the second input has
+    more VDBs than the first.