UFE v3/v4 compatibility fix #3

Autodesk · Sep 12, 2022 · aa8b425 · aa8b425
1 parent 4da800c
commit aa8b425
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/lib/mayaUsd/fileio/orphanedNodesManager.cpp b/lib/mayaUsd/fileio/orphanedNodesManager.cpp
@@ -120,14 +120,14 @@ void OrphanedNodesManager::operator()(const Ufe::Notification& n)
         // notifications.
         if (auto objAdd = dynamic_cast<const Ufe::ObjectAdd*>(&sceneNotification)) {
             handleOp(Ufe::SceneCompositeNotification::Op(
-                Ufe::SceneCompositeNotification::ObjectAdd, objAdd->item()));
+                Ufe::SceneCompositeNotification::OpType::ObjectAdd, objAdd->item()));
         } else if (auto objDel = dynamic_cast<const Ufe::ObjectDelete*>(&sceneNotification)) {
             handleOp(Ufe::SceneCompositeNotification::Op(
-                Ufe::SceneCompositeNotification::ObjectDelete, objDel->path()));
+                Ufe::SceneCompositeNotification::OpType::ObjectDelete, objDel->path()));
         } else if (
             auto subtrInv = dynamic_cast<const Ufe::SubtreeInvalidate*>(&sceneNotification)) {
             handleOp(Ufe::SceneCompositeNotification::Op(
-                Ufe::SceneCompositeNotification::SubtreeInvalidate, subtrInv->root()));
+                Ufe::SceneCompositeNotification::OpType::SubtreeInvalidate, subtrInv->root()));
         }
 #endif
     }
@@ -276,6 +276,7 @@ void OrphanedNodesManager::recursiveSetVisibility(
     const Ufe::TrieNode<PullVariantInfo>::Ptr& trieNode,
     bool                                       visibility)
 {
+#if (UFE_PREVIEW_VERSION_NUM >= 4026)
     // We know in our case that a trie node with data can't have children,
     // since descendants of a pulled prim can't be pulled.
     if (trieNode->hasData()) {
@@ -287,13 +288,15 @@ void OrphanedNodesManager::recursiveSetVisibility(
             recursiveSetVisibility((*trieNode)[c], visibility);
         }
     }
+#endif
 }
 
 /* static */
 void OrphanedNodesManager::recursiveSwitch(
     const Ufe::TrieNode<PullVariantInfo>::Ptr& trieNode,
     const Ufe::Path&                           ufePath)
 {
+#if (UFE_PREVIEW_VERSION_NUM >= 4026)
     // We know in our case that a trie node with data can't have children,
     // since descendants of a pulled prim can't be pulled.  A trie node with
     // data is one that's been pulled.
@@ -334,6 +337,7 @@ void OrphanedNodesManager::recursiveSwitch(
             }
         }
     }
+#endif
 }
 
 /* static */
@@ -370,6 +374,7 @@ void OrphanedNodesManager::deepCopy(
     const Ufe::TrieNode<PullVariantInfo>::Ptr& src,
     const Ufe::TrieNode<PullVariantInfo>::Ptr& dst)
 {
+#if (UFE_PREVIEW_VERSION_NUM >= 4026)
     for (const auto& c : src->childrenComponents()) {
         const auto& srcChild = (*src)[c];
         auto        dstChild = std::make_shared<Ufe::TrieNode<PullVariantInfo>>(c);
@@ -379,6 +384,7 @@ void OrphanedNodesManager::deepCopy(
         }
         deepCopy(srcChild, dstChild);
     }
+#endif
 }
 
 } // namespace MAYAUSD_NS_DEF