summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2021-03-17 10:37:57 +0100
committerGitHub <noreply@github.com>2021-03-17 10:37:57 +0100
commit8088218e1e10392079322acf439bfee34f9e928c (patch)
tree92153f6d603823110cbe754fdf65b0aa29810371
parent00fcc9d340443c40eb0f51142d3a8b2d65f8acf8 (diff)
parent9798a52a2063976fd5cac75dc5be693e76deaab8 (diff)
Merge pull request #47081 from nekomatata/collision-debug-shape-game-only
Disable debug collision shapes in the editor
-rw-r--r--scene/3d/collision_object_3d.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/scene/3d/collision_object_3d.cpp b/scene/3d/collision_object_3d.cpp
index 849ef7a2bf..39880db29c 100644
--- a/scene/3d/collision_object_3d.cpp
+++ b/scene/3d/collision_object_3d.cpp
@@ -30,6 +30,7 @@
#include "collision_object_3d.h"
+#include "core/config/engine.h"
#include "mesh_instance_3d.h"
#include "scene/scene_string_names.h"
#include "servers/physics_server_3d.h"
@@ -139,7 +140,7 @@ void CollisionObject3D::_update_debug_shapes() {
}
void CollisionObject3D::_update_shape_data(uint32_t p_owner) {
- if (is_inside_tree() && get_tree()->is_debugging_collisions_hint()) {
+ if (is_inside_tree() && get_tree()->is_debugging_collisions_hint() && !Engine::get_singleton()->is_editor_hint()) {
if (debug_shapes_to_update.is_empty()) {
call_deferred("_update_debug_shapes");
}