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 /servers/rendering/renderer_rd | |
| 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 'servers/rendering/renderer_rd')
| -rw-r--r-- | servers/rendering/renderer_rd/renderer_storage_rd.cpp | 2 | ||||
| -rw-r--r-- | servers/rendering/renderer_rd/shaders/particles.glsl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/servers/rendering/renderer_rd/renderer_storage_rd.cpp b/servers/rendering/renderer_rd/renderer_storage_rd.cpp index 1ffc024d42..b74a1083e7 100644 --- a/servers/rendering/renderer_rd/renderer_storage_rd.cpp +++ b/servers/rendering/renderer_rd/renderer_storage_rd.cpp @@ -8780,7 +8780,7 @@ RendererStorageRD::RendererStorageRD() { actions.renames["RESTART_VELOCITY"] = "restart_velocity"; actions.renames["RESTART_COLOR"] = "restart_color"; actions.renames["RESTART_CUSTOM"] = "restart_custom"; - actions.renames["emit_particle"] = "emit_particle"; + actions.renames["emit_subparticle"] = "emit_subparticle"; actions.renames["COLLIDED"] = "collided"; actions.renames["COLLISION_NORMAL"] = "collision_normal"; actions.renames["COLLISION_DEPTH"] = "collision_depth"; diff --git a/servers/rendering/renderer_rd/shaders/particles.glsl b/servers/rendering/renderer_rd/shaders/particles.glsl index 926c7ef9fc..cb6d8dc7f6 100644 --- a/servers/rendering/renderer_rd/shaders/particles.glsl +++ b/servers/rendering/renderer_rd/shaders/particles.glsl @@ -173,7 +173,7 @@ uint hash(uint x) { return x; } -bool emit_particle(mat4 p_xform, vec3 p_velocity, vec4 p_color, vec4 p_custom, uint p_flags) { +bool emit_subparticle(mat4 p_xform, vec3 p_velocity, vec4 p_color, vec4 p_custom, uint p_flags) { if (!params.can_emit) { return false; } |