Fixed Normal Map assiignation when importing FBX Materials (#6491)

adrien-de-tocqueville · sebastienlagarde · web-flow · commit d9c12ffe5131 · 2021-12-08T15:38:11.000+01:00
Co-authored-by: sebastienlagarde &lt;sebastien@unity3d.com&gt;
diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md
@@ -57,6 +57,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fixed a warning because of a null texture in the lens flare pass.
 - Fixed a nullref when enabling raycount without ray tracing.
 - Fixed error thrown when layered lit material has an invalid material type.
+- Fixed Normal Map assiignation when importing FBX Materials.
 
 ## [13.1.2] - 2021-11-05
 
diff --git a/com.unity.render-pipelines.high-definition/Editor/AssetProcessors/FBXMaterialDescriptionPostprocessor.cs b/com.unity.render-pipelines.high-definition/Editor/AssetProcessors/FBXMaterialDescriptionPostprocessor.cs
@@ -110,17 +110,17 @@ public void OnPreprocessMaterialDescription(MaterialDescription description, Mat
 
             if (description.TryGetProperty("Bump", out textureProperty) && textureProperty.texture != null)
             {
-                SetMaterialTextureProperty("_BumpMap", material, textureProperty);
+                SetMaterialTextureProperty("_NormalMap", material, textureProperty);
 
                 if (description.TryGetProperty("BumpFactor", out floatProperty))
-                    material.SetFloat("_BumpScale", floatProperty);
+                    material.SetFloat("_NormalScale", floatProperty);
             }
             else if (description.TryGetProperty("NormalMap", out textureProperty) && textureProperty.texture != null)
             {
-                SetMaterialTextureProperty("_BumpMap", material, textureProperty);
+                SetMaterialTextureProperty("_NormalMap", material, textureProperty);
 
                 if (description.TryGetProperty("BumpFactor", out floatProperty))
-                    material.SetFloat("_BumpScale", floatProperty);
+                    material.SetFloat("_NormalScale", floatProperty);
             }
 
             if (description.TryGetProperty("EmissiveColor", out textureProperty))

Original file line number	Diff line number	Diff line change
`@@ -110,17 +110,17 @@ public void OnPreprocessMaterialDescription(MaterialDescription description, Mat`
`110`	`110`
`111`	`111`	`if (description.TryGetProperty("Bump", out textureProperty) && textureProperty.texture != null)`
`112`	`112`	`{`
`113`		`- SetMaterialTextureProperty("_BumpMap", material, textureProperty);`
	`113`	`+ SetMaterialTextureProperty("_NormalMap", material, textureProperty);`
`114`	`114`
`115`	`115`	`if (description.TryGetProperty("BumpFactor", out floatProperty))`
`116`		`- material.SetFloat("_BumpScale", floatProperty);`
	`116`	`+ material.SetFloat("_NormalScale", floatProperty);`
`117`	`117`	`}`
`118`	`118`	`else if (description.TryGetProperty("NormalMap", out textureProperty) && textureProperty.texture != null)`
`119`	`119`	`{`
`120`		`- SetMaterialTextureProperty("_BumpMap", material, textureProperty);`
	`120`	`+ SetMaterialTextureProperty("_NormalMap", material, textureProperty);`
`121`	`121`
`122`	`122`	`if (description.TryGetProperty("BumpFactor", out floatProperty))`
`123`		`- material.SetFloat("_BumpScale", floatProperty);`
	`123`	`+ material.SetFloat("_NormalScale", floatProperty);`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`if (description.TryGetProperty("EmissiveColor", out textureProperty))`