Relaxed contraints when loading a save #6012

BabylonJS · Aug 20, 2019 · d006ce8 · d006ce8
1 parent afa7050
commit d006ce8
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/dist/preview release/babylon.js b/dist/preview release/babylon.js
diff --git a/src/Materials/Node/Blocks/Fragment/alphaTestBlock.ts b/src/Materials/Node/Blocks/Fragment/alphaTestBlock.ts
@@ -62,7 +62,7 @@ export class AlphaTestBlock extends NodeMaterialBlock {
 
         return this;
     }
-      
+
     protected _dumpPropertiesCode() {
         var codeString = `${this._codeVariableName}.alphaCutOff = ${this.alphaCutOff};\r\n`;
 

diff --git a/src/Materials/Node/Blocks/transformBlock.ts b/src/Materials/Node/Blocks/transformBlock.ts
@@ -106,7 +106,7 @@ export class TransformBlock extends NodeMaterialBlock {
         codeString += `${this._codeVariableName}.complementW = ${this.complementW};\r\n`;
 
         return codeString;
-    } 
+    }
 }
 
 _TypeStore.RegisteredTypes["BABYLON.TransformBlock"] = TransformBlock;
diff --git a/src/Materials/Node/nodeMaterial.ts b/src/Materials/Node/nodeMaterial.ts
@@ -1112,7 +1112,7 @@ export class NodeMaterial extends PushMaterial {
                             continue;
                         }
 
-                        outputPoint.connectTo(inputPoint);
+                        outputPoint.connectTo(inputPoint, true);
                         this._restoreConnections(target, source, map);
                         continue;
                     }

diff --git a/src/Materials/Node/nodeMaterialBlockConnectionPoint.ts b/src/Materials/Node/nodeMaterialBlockConnectionPoint.ts
@@ -214,10 +214,11 @@ export class NodeMaterialConnectionPoint {
     /**
      * Connect this point to another connection point
      * @param connectionPoint defines the other connection point
+     * @param ignoreConstraints defines if the system will ignore connection type constraints (default is false)
      * @returns the current connection point
      */
-    public connectTo(connectionPoint: NodeMaterialConnectionPoint): NodeMaterialConnectionPoint {
-        if (!this.canConnectTo(connectionPoint)) {
+    public connectTo(connectionPoint: NodeMaterialConnectionPoint, ignoreConstraints = false): NodeMaterialConnectionPoint {
+        if (!ignoreConstraints && !this.canConnectTo(connectionPoint)) {
             throw "Cannot connect two different connection types.";
         }