summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2018-11-16 08:49:26 -0300
committerJuan Linietsky <reduzio@gmail.com>2018-11-16 08:49:26 -0300
commit0b1e93ccd43815d93de031b4f23fbfcd9ae7a34c (patch)
treed0d09cf6c744eb61438ed6ce775eafed22f5b4a1 /modules
parent26d33d1c6eedf9271bac20a24ea37453c21ef890 (diff)
-Make sure monitorable cant be flipped while flushing queries, fixes #17330
-Also added set_deferred, this was missing.
Diffstat (limited to 'modules')
-rw-r--r--modules/bullet/bullet_physics_server.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/modules/bullet/bullet_physics_server.h b/modules/bullet/bullet_physics_server.h
index 6b7dcd86e6..c8c782267e 100644
--- a/modules/bullet/bullet_physics_server.h
+++ b/modules/bullet/bullet_physics_server.h
@@ -397,6 +397,8 @@ public:
virtual void flush_queries();
virtual void finish();
+ virtual bool is_flushing_queries() const { return false; }
+
virtual int get_process_info(ProcessInfo p_info);
CollisionObjectBullet *get_collisin_object(RID p_object) const;