@babylonjs/core 5.17.0 → 5.17.1

package/Materials/Node/nodeMaterial.d.ts

@@ -452,9 +452,10 @@ export declare class NodeMaterial extends PushMaterial {
      * @param scene defines the hosting scene
      * @param rootUrl defines the root URL for nested url in the node material
      * @param skipBuild defines whether to build the node material
+     * @param targetMaterial defines a material to use instead of creating a new one
      * @returns a promise that will resolve to the new node material
      */
-    static ParseFromFileAsync(name: string, url: string, scene: Scene, rootUrl?: string, skipBuild?: boolean): Promise<NodeMaterial>;
+    static ParseFromFileAsync(name: string, url: string, scene: Scene, rootUrl?: string, skipBuild?: boolean, targetMaterial?: NodeMaterial): Promise<NodeMaterial>;
     /**
      * Creates a node material from a snippet saved by the node material editor
      * @param snippetId defines the snippet to load

package/Materials/Node/nodeMaterial.js

@@ -1326,7 +1326,7 @@ var NodeMaterial = /** @class */ (function (_super) {
         if (rootUrl === void 0) { rootUrl = ""; }
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                return [2 /*return*/, NodeMaterial.ParseFromFileAsync(url, rootUrl, this.getScene())];
+                return [2 /*return*/, NodeMaterial.ParseFromFileAsync("", url, this.getScene(), rootUrl, true, this)];
             });
         });
     };
@@ -1602,9 +1602,10 @@ var NodeMaterial = /** @class */ (function (_super) {
      * @param scene defines the hosting scene
      * @param rootUrl defines the root URL for nested url in the node material
      * @param skipBuild defines whether to build the node material
+     * @param targetMaterial defines a material to use instead of creating a new one
      * @returns a promise that will resolve to the new node material
      */
-    NodeMaterial.ParseFromFileAsync = function (name, url, scene, rootUrl, skipBuild) {
+    NodeMaterial.ParseFromFileAsync = function (name, url, scene, rootUrl, skipBuild, targetMaterial) {
         if (rootUrl === void 0) { rootUrl = ""; }
         if (skipBuild === void 0) { skipBuild = false; }
         return __awaiter(this, void 0, void 0, function () {
@@ -1612,7 +1613,7 @@ var NodeMaterial = /** @class */ (function (_super) {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        material = new NodeMaterial(name, scene);
+                        material = targetMaterial !== null && targetMaterial !== void 0 ? targetMaterial : new NodeMaterial(name, scene);
                         return [4 /*yield*/, scene._loadFileAsync(url)];
                     case 1:
                         data = _a.sent();