Merge pull request #1076 from sideeffects/send_upstream_renamevectormerge

Rename VDB Vector Merge to VDB Vector from Scalar

Author: jmlait

openvdb_houdini/openvdb_houdini/SOP_OpenVDB_Vector_Merge.cc

@@ -192,8 +192,13 @@ Position:\n\
         .setDefault("@name=*.z"));
 
     // Register this operator.
-    hvdb::OpenVDBOpFactory("VDB Vector Merge",
+    hvdb::OpenVDBOpFactory("VDB Vector from Scalar",
         SOP_OpenVDB_Vector_Merge::factory, parms, *table)
+#ifndef SESI_OPENVDB
+        .setInternalName("DW_OpenVDBVectorMerge")
+#else
+        .setInternalName("vdbvectormerge")
+#endif
         .addInput("Scalar VDBs to merge into vector")
         .setObsoleteParms(obsoleteParms)
         .setVerb(SOP_NodeVerb::COOK_INPLACE, []() { return new SOP_OpenVDB_Vector_Merge::Cache; })

pendingchanges/rename_vdbvectormerge_sop.txt

@@ -0,0 +1,4 @@
+Houdini:
+    VDB Vector Merge SOP is now VDB Vector From Scalar SOP to distinguish
+    it from the VDB Merge SOP.   It keeps the same internal name so this
+    is merely a label change.