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

fix: use _UseEmission2nd for emission 2nd #1184

Merged
merged 3 commits into from
Sep 17, 2024
Merged

fix: use _UseEmission2nd for emission 2nd #1184

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
83f551f
fix: use _UseEmission2nd for emission 2nd
anatawa12 Sep 17, 2024
2e0be49
docs(changelog): update changelog
anatawa12 Sep 17, 2024
d96d6fe
fix: use _UseEmission2nd for emission 2nd
anatawa12 Sep 17, 2024
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
3 changes: 2 additions & 1 deletion CHANGELOG-PRERELEASE.md
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ public override bool GetTextureUsageInformationForMaterial(TextureUsageInformati
UsingUVChannels.NonMesh, null); // GradationMap UV is based on color
LIL_SAMPLE_2D_WithMat("_MainColorAdjustMask", "_MainTex", uvMain, uvMainMatrix); // simple LIL_SAMPLE_2D

if (matInfo.GetInteger("_UseMain2ndTex") != 0)
if (matInfo.GetInteger("_UseEmission2nd") != 0)
{
// caller of lilGetMain2nd will pass sampler for _MainTex as samp
SamplerStateInformation samp = "_MainTex";
Expand Down
Loading