Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix fbx material #6491

Merged
merged 2 commits into from
Dec 8, 2021
Merged

Fix fbx material #6491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04fb2ba
Fixed Normal Map assiignation when importing FBX Materials
adrien-de-tocqueville Dec 6, 2021
b8ed939
Merge branch 'hd/bugfix' into hd/fix-fbx-material
sebastienlagarde Dec 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions com.unity.render-pipelines.high-definition/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions ...r-pipelines.high-definition/Editor/AssetProcessors/FBXMaterialDescriptionPostprocessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down