diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-02-17 16:15:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-17 16:15:22 +0100 |
| commit | f91c4c08999cc79586d74973953202a2af4dd7ee (patch) | |
| tree | 83f54bbc279367cc99468e37dcd732e07dcad444 | |
| parent | 5d8abd5bad71e667f6b612cebfeb64333d7232f6 (diff) | |
| parent | c97fffdc594d2fff05621565e2f6501234b1ba01 (diff) | |
Merge pull request #46124 from angad-k/cpu-particles-3d-fix
CPUParticles3D crash fix
| -rw-r--r-- | scene/3d/cpu_particles_3d.cpp | 2 | ||||
| -rw-r--r-- | scene/3d/cpu_particles_3d.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/scene/3d/cpu_particles_3d.cpp b/scene/3d/cpu_particles_3d.cpp index 7825119e6e..979c6424b8 100644 --- a/scene/3d/cpu_particles_3d.cpp +++ b/scene/3d/cpu_particles_3d.cpp @@ -152,6 +152,7 @@ float CPUParticles3D::get_speed_scale() const { } void CPUParticles3D::set_draw_order(DrawOrder p_order) { + ERR_FAIL_INDEX(p_order, DRAW_ORDER_MAX); draw_order = p_order; } @@ -1011,6 +1012,7 @@ void CPUParticles3D::_update_particle_data_buffer() { sorter.compare.particles = r; sorter.sort(order, pc); } else if (draw_order == DRAW_ORDER_VIEW_DEPTH) { + ERR_FAIL_NULL(get_viewport()); Camera3D *c = get_viewport()->get_camera(); if (c) { Vector3 dir = c->get_global_transform().basis.get_axis(2); //far away to close diff --git a/scene/3d/cpu_particles_3d.h b/scene/3d/cpu_particles_3d.h index d650bf95ac..4af959a7bf 100644 --- a/scene/3d/cpu_particles_3d.h +++ b/scene/3d/cpu_particles_3d.h @@ -43,6 +43,7 @@ public: DRAW_ORDER_INDEX, DRAW_ORDER_LIFETIME, DRAW_ORDER_VIEW_DEPTH, + DRAW_ORDER_MAX }; enum Parameter { |