Update Document methods

Ensure datalibrary is copied and cleared. Temporarily disable JS binding
autodesk-forks · Oct 9, 2024 · 3dd6999 · 3dd6999
1 parent 604499a
commit 3dd6999
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/source/JsMaterialX/JsMaterialXCore/JsElement.cpp b/source/JsMaterialX/JsMaterialXCore/JsElement.cpp
@@ -22,10 +22,6 @@ namespace mx = MaterialX;
     BIND_MEMBER_FUNC("setValue" #NAME, mx::ValueElement, setValue<T>, 1, 2, const T&, stRef)
 
 #define BIND_ELEMENT_CHILD_FUNC_INSTANCE(NAME, T)                                                 \
-    BIND_MEMBER_FUNC("addChild" #NAME, mx::Element, addChild<T>, 0, 1, stRef)                     \
-    .function("getChildOfType" #NAME, &mx::Element::getChildOfType<T>)                            \
-    BIND_MEMBER_FUNC("getChildrenOfType" #NAME, mx::Element, getChildrenOfType<T>, 0, 1, stRef)   \
-    .function("removeChildOfType" #NAME, &mx::Element::removeChildOfType<T>)                      \
     BIND_MEMBER_FUNC("isA" #NAME, mx::Element, isA<T>, 0, 1, stRef)                               \
     .function("asA" #NAME, ems::select_overload<std::shared_ptr<T>()>(&mx::Element::asA<T>))
 

diff --git a/source/MaterialXCore/Document.cpp b/source/MaterialXCore/Document.cpp
@@ -404,6 +404,7 @@ bool Document::validate(string* message) const
 void Document::invalidateCache()
 {
     _cache->valid = false;
+    _dataLibrary = nullptr;
 }
 
 //

diff --git a/source/MaterialXCore/Document.h b/source/MaterialXCore/Document.h
@@ -50,6 +50,8 @@ class MX_CORE_API Document : public GraphElement
     {
         DocumentPtr doc = createDocument<Document>();
         doc->copyContentFrom(getSelf());
+        if (hasDataLibrary())
+            doc->registerDataLibrary(getRegisteredDataLibrary());
         return doc;
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -404,6 +404,7 @@ bool Document::validate(string* message) const @@
     void Document::invalidateCache()
     {
         _cache->valid = false;
+        _dataLibrary = nullptr;
     }
     //
@@ Expand Down @@