Skip to content

Commit

Permalink
Merge pull request #1184 from anatawa12/fix-_UseEmission2nd-error
Browse files Browse the repository at this point in the history
fix: use _UseEmission2nd for emission 2nd
  • Loading branch information
anatawa12 authored Sep 17, 2024
2 parents 21ae4f7 + d96d6fe commit 7be724f
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG-PRERELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ The format is based on [Keep a Changelog].
- We may relax some restriction in the future.
- Because we have to check for each condition if we use AnyState but we can check for only one (in best case) with entry/exit, this generally reduces cost for checking an parameter in a state.
- Combined with Entry / Exit to 1D BlendTree optimization, which is implemented in previous release, your AnyState layer may be optimized to 1D BlendTree.
- Optimize Texture in Trace nad Optimize `#1181`
- Optimize Texture in Trace nad Optimize `#1181` `#1184`
- Avatar Optimizer will pack texture and tries to reduce the VRAM usage.
- Currently liltoon is only supported.

### Changed
- Skip Enablement Mismatched Renderers is now disabled by default `#1169`
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ The format is based on [Keep a Changelog].
- We may relax some restriction in the future.
- Because we have to check for each condition if we use AnyState but we can check for only one (in best case) with entry/exit, this generally reduces cost for checking an parameter in a state.
- Combined with Entry / Exit to 1D BlendTree optimization, which is implemented in previous release, your AnyState layer may be optimized to 1D BlendTree.
- Optimize Texture in Trace nad Optimize `#1181`
- Optimize Texture in Trace nad Optimize `#1181` `#1184`
- Avatar Optimizer will pack texture and tries to reduce the VRAM usage.
- Currently liltoon is only supported.

### Changed
- Skip Enablement Mismatched Renderers is now disabled by default `#1169`
Expand Down
2 changes: 1 addition & 1 deletion Editor/APIInternal/ShaderInformation.Liltoon.cs
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ public override bool GetTextureUsageInformationForMaterial(TextureUsageInformati
}
}

if (matInfo.GetInteger("_Emission2ndMap") != 0)
if (matInfo.GetInteger("_UseEmission2nd") != 0)
{
UsingUVChannels emission2ndUV = UsingUVChannels.UV0;

Expand Down

0 comments on commit 7be724f

Please sign in to comment.