Commit d6f8635
committed
fix: only skip uSampler override when user explicitly set it
Replace isUserFillShader check with _userSetSampler flag on Shader,
tracking only explicit user calls to setUniform('uSampler', ...).
Guarded by _settingFillUniforms on renderer to distinguish internal
_setFillUniforms calls from user calls.
Fixes the texture() does not remain bound test which uses
baseMaterialShader().modify({}) with shader() — previously caught
by isUserFillShader check, preventing uSampler reset to empty texture
after pop().1 parent f75f227 commit d6f8635
2 files changed
Lines changed: 10 additions & 9 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1496 | 1496 | | |
1497 | 1497 | | |
1498 | 1498 | | |
1499 | | - | |
1500 | | - | |
1501 | | - | |
1502 | | - | |
1503 | | - | |
1504 | | - | |
1505 | | - | |
1506 | | - | |
1507 | | - | |
| 1499 | + | |
| 1500 | + | |
1508 | 1501 | | |
1509 | 1502 | | |
| 1503 | + | |
1510 | 1504 | | |
1511 | 1505 | | |
1512 | 1506 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1103 | 1103 | | |
1104 | 1104 | | |
1105 | 1105 | | |
| 1106 | + | |
| 1107 | + | |
| 1108 | + | |
| 1109 | + | |
| 1110 | + | |
| 1111 | + | |
| 1112 | + | |
1106 | 1113 | | |
1107 | 1114 | | |
1108 | 1115 | | |
| |||
0 commit comments