Fix(ShaderLab): make UsePass directive compatible with all builtin shader names
#1855
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
GuoLei1990
approved these changes
Nov 1, 2023
GuoLei1990
approved these changes
Nov 1, 2023
GuoLei1990
added a commit
that referenced
this pull request
Nov 1, 2023
* main: (29 commits) Fix(ShaderLab): make `UsePass` directive compatible with all builtin shader names (#1855) feat: ParticleGenerator support simulationSpeed (#1854) fix: sprite destroy (#1852) "v1.1.0-beta.18" Fix quaternion to euler bug (#1851) Fix ColorOverLifetimeModule mode invalid bug (#1850) fix: no autoplay when set animatorController after enable (#1843) Fix material destoroy bug (#1847) Fix Sprite can't batch bug caused by material instance (#1830) "v1.1.0-beta.17" fix: glTF animation parse bug (#1845) fix: mesh decoder (#1844) "v1.1.0-beta.16" Fix blendShape crossFade bug (#1841) fix: ignore ambient in 2d template (#1836) "v1.1.0-beta.15" Fix blendShapeAnimation crossFade bug (#1840) fix: ignore case of asset url (#1809) `Shaderlab` remove editor properties (#1825) fix: ktx2 texture support (#1829) ... # Conflicts: # packages/core/src/particle/ParticleRenderer.ts
zhuxudong
added a commit
to zhuxudong/engine
that referenced
this pull request
Nov 7, 2023
* dev/1.2: (31 commits) Add sunSource (galacean#1823) Fix(ShaderLab): make `UsePass` directive compatible with all builtin shader names (galacean#1855) feat: ParticleGenerator support simulationSpeed (galacean#1854) fix: sprite destroy (galacean#1852) "v1.1.0-beta.18" Fix quaternion to euler bug (galacean#1851) Fix ColorOverLifetimeModule mode invalid bug (galacean#1850) fix: no autoplay when set animatorController after enable (galacean#1843) Refactor `glTFResource` (galacean#1831) Fix material destoroy bug (galacean#1847) Fix Sprite can't batch bug caused by material instance (galacean#1830) "v1.1.0-beta.17" fix: glTF animation parse bug (galacean#1845) fix: mesh decoder (galacean#1844) "v1.1.0-beta.16" Fix blendShape crossFade bug (galacean#1841) fix: ignore ambient in 2d template (galacean#1836) "v1.1.0-beta.15" Fix blendShapeAnimation crossFade bug (galacean#1840) fix: ignore case of asset url (galacean#1809) ... # Conflicts: # packages/loader/src/gltf/parser/GLTFParserContext.ts
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Please check if the PR fulfills these requirements