Fix so that we don't remove normalmap and tangent inputs if they alre…

…ady exist when adding default inputs. (#12)
kwokcb · Dec 6, 2023 · ab695ad · ab695ad
1 parent ab1afe0
commit ab695ad
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/src/materialxgltf/core.py b/src/materialxgltf/core.py
@@ -1952,15 +1952,23 @@ def materialX2glTF(self, doc, gltfJson, resetMaterials):
                 path = shaderNode.getNamePath()
                 if category == MTLX_GLTF_PBR_CATEGORY and path not in pbrNodes:
                     if addInputsFromNodeDef:
+                        hasNormal = shaderNode.getInput('normal')
+                        hasTangent = shaderNode.getInput('tangent')
                         shaderNode.addInputsFromNodeDef()
-                        shaderNode.removeChild('tangent')
-                        shaderNode.removeChild('normal')
+                        if not hasNormal:
+                            shaderNode.removeChild('tangent')
+                        if not hasTangent:
+                            shaderNode.removeChild('normal')
                     pbrNodes[path] = shaderNode
                 elif category == MTLX_UNLIT_CATEGORY_STRING and path not in unlitNodes:
                     if addInputsFromNodeDef:
+                        hasNormal = shaderNode.getInput('normal')
+                        hasTangent = shaderNode.getInput('tangent')
                         shaderNode.addInputsFromNodeDef()
-                        shaderNode.removeChild('tangent')
-                        shaderNode.removeChild('normal')                        
+                        if not hasNormal:
+                            shaderNode.removeChild('tangent')
+                        if not hasTangent:
+                            shaderNode.removeChild('normal')                        
                     unlitNodes[path] = shaderNode
 
         materials_count = len(pbrNodes) + len(unlitNodes)
@@ -2349,7 +2357,7 @@ def materialX2glTF(self, doc, gltfJson, resetMaterials):
                 if imageNode:
                     fileInput = imageNode.getInput(mx.Implementation.FILE_ATTRIBUTE)
                     filename = EMPTY_STRING
-                    if fileInput and fileInput.getAttribute(mx.TypedElement.TYPE_ATTRIBUTE) == mx.FILENAME_TYPE_STRING:                    
+                    if fileInput and fileInput.getAttribute(mx.TypedElement.TYPE_ATTRIBUTE) == mx.FILENAME_TYPE_STRING:
                         filename = fileInput.getResolvedValueString()
                     if len(filename) == 0:
                         imageNode = None