diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-01-12 19:33:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-12 19:33:29 +0100 |
| commit | ab1503c9d5c1341c183c12a8c429b89d9f9bf548 (patch) | |
| tree | 6649d0ea651d85be10259bc855a8c69389a62567 /scene | |
| parent | df257f4fb6f0eadd204b91396854eee5d72ebd9b (diff) | |
| parent | ef941a6500676ffd0fd6176c6e0d73993f07768d (diff) | |
Merge pull request #45121 from Chaosus/shader_emit
Renamed `emit_particle` to `emit_subparticle` shader function
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/resources/particles_material.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/resources/particles_material.cpp b/scene/resources/particles_material.cpp index 73b7a5cfe9..3aa9f9b3bc 100644 --- a/scene/resources/particles_material.cpp +++ b/scene/resources/particles_material.cpp @@ -646,7 +646,7 @@ void ParticlesMaterial::_update_shader() { code += " for(int i=0;i<emit_count;i++) {\n"; code += " uint flags = FLAG_EMIT_POSITION|FLAG_EMIT_ROT_SCALE;\n"; code += " if (sub_emitter_keep_velocity) flags|=FLAG_EMIT_VELOCITY;\n"; - code += " emit_particle(TRANSFORM,VELOCITY,vec4(0.0),vec4(0.0),flags);\n"; + code += " emit_subparticle(TRANSFORM,VELOCITY,vec4(0.0),vec4(0.0),flags);\n"; code += " }"; } |