Commit 923eb44
committed
Merge pull request godotengine#101617 from paddy-exe/processmaterial-vs-shadermaterial
Fix `emission_shape_changed` signal error when using ShaderMaterial with GPUParticles3DFile tree
2 files changed
+14
-4
lines changed- doc/classes
- scene/3d
2 files changed
+14
-4
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
418 | 418 | | |
419 | 419 | | |
420 | 420 | | |
| 421 | + | |
421 | 422 | | |
422 | 423 | | |
423 | 424 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
145 | 145 | | |
146 | 146 | | |
147 | 147 | | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
148 | 156 | | |
149 | 157 | | |
150 | 158 | | |
151 | 159 | | |
152 | | - | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
153 | 165 | | |
154 | 166 | | |
155 | 167 | | |
| |||
554 | 566 | | |
555 | 567 | | |
556 | 568 | | |
557 | | - | |
558 | | - | |
559 | | - | |
560 | 569 | | |
561 | 570 | | |
562 | 571 | | |
| |||
0 commit comments