-
-
Notifications
You must be signed in to change notification settings - Fork 287
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.
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 Sprite can't batch bug caused by material instance #1830
Conversation
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## main #1830 +/- ##
==========================================
+ Coverage 64.99% 66.78% +1.78%
==========================================
Files 473 472 -1
Lines 23749 23719 -30
Branches 3366 3377 +11
==========================================
+ Hits 15436 15841 +405
+ Misses 7110 6682 -428
+ Partials 1203 1196 -7
☔ View full report in Codecov by Sentry. |
@@ -81,6 +83,8 @@ export class Engine extends EventDispatcher { | |||
|
|||
/* @internal */ | |||
_spriteDefaultMaterial: Material; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This maybe delete
* 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
* 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
It will invalidate the batch.