diff options
| author | Juan Linietsky <juan@godotengine.org> | 2019-03-02 08:48:13 -0300 |
|---|---|---|
| committer | Juan Linietsky <juan@godotengine.org> | 2019-03-02 08:48:47 -0300 |
| commit | b84b015225dffb373f409c929821da6961e6d485 (patch) | |
| tree | bf6c149aacaf54b5e91060802a7a4c4d56047559 /scene | |
| parent | a42549b8f703754a43bad2557357cb7046874118 (diff) | |
Make query checks less agressive, fixes #24694
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/2d/area_2d.cpp | 2 | ||||
| -rw-r--r-- | scene/3d/area.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scene/2d/area_2d.cpp b/scene/2d/area_2d.cpp index 9e8bf62fc5..2a225e5797 100644 --- a/scene/2d/area_2d.cpp +++ b/scene/2d/area_2d.cpp @@ -428,8 +428,8 @@ void Area2D::set_monitorable(bool p_enable) { if (locked || (is_inside_tree() && Physics2DServer::get_singleton()->is_flushing_queries())) { ERR_EXPLAIN("Function blocked during in/out signal. Use set_deferred(\"monitorable\",true/false)"); + ERR_FAIL(); } - ERR_FAIL_COND(locked || Physics2DServer::get_singleton()->is_flushing_queries()); if (p_enable == monitorable) return; diff --git a/scene/3d/area.cpp b/scene/3d/area.cpp index 9e15a416b2..e58e26d2d1 100644 --- a/scene/3d/area.cpp +++ b/scene/3d/area.cpp @@ -441,8 +441,8 @@ void Area::set_monitorable(bool p_enable) { if (locked || (is_inside_tree() && PhysicsServer::get_singleton()->is_flushing_queries())) { ERR_EXPLAIN("Function blocked during in/out signal. Use set_deferred(\"monitorable\",true/false)"); + ERR_FAIL(); } - ERR_FAIL_COND(locked || PhysicsServer::get_singleton()->is_flushing_queries()); if (p_enable == monitorable) return; |