summaryrefslogtreecommitdiff
path: root/scene
diff options
context:
space:
mode:
authorSamuele Panzeri <samuele.panzeri@gmail.com>2023-04-19 11:00:11 +0200
committerYuri Sizov <yuris@humnom.net>2023-04-26 14:14:07 +0200
commita27dd86755178744fd7487a8a2170d7bb6fe6f22 (patch)
treefbacf368a4f3e827599a42c3609af21c3d0eefbc /scene
parent46e7f334fb39b21f8454f389a7a98070e8884672 (diff)
Fix editor lock on sdf collision bake on error
(cherry picked from commit a2be742f97cb9f027082483dc56ec0822b23aceb)
Diffstat (limited to 'scene')
-rw-r--r--scene/3d/gpu_particles_collision_3d.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/scene/3d/gpu_particles_collision_3d.cpp b/scene/3d/gpu_particles_collision_3d.cpp
index 137d578291..cbc75801b0 100644
--- a/scene/3d/gpu_particles_collision_3d.cpp
+++ b/scene/3d/gpu_particles_collision_3d.cpp
@@ -469,8 +469,13 @@ Ref<Image> GPUParticlesCollisionSDF3D::bake() {
}
//compute bvh
-
- ERR_FAIL_COND_V_MSG(faces.size() <= 1, Ref<Image>(), "No faces detected during GPUParticlesCollisionSDF3D bake. Check whether there are visible meshes matching the bake mask within its extents.");
+ if (faces.size() <= 1) {
+ ERR_PRINT("No faces detected during GPUParticlesCollisionSDF3D bake. Check whether there are visible meshes matching the bake mask within its extents.");
+ if (bake_end_function) {
+ bake_end_function();
+ }
+ return Ref<Image>();
+ }
LocalVector<FacePos> face_pos;