aboutsummaryrefslogtreecommitdiff
path: root/core/object.cpp
diff options
context:
space:
mode:
authorJuan Linietsky2015-04-07 20:14:51 -0300
committerJuan Linietsky2015-04-07 20:14:51 -0300
commit7b75658bb266a8b79b4fff0d883d81600c3d37ba (patch)
tree1274cb7c4d0a631dfe0199569b779a9362c23e50 /core/object.cpp
parentb1bf4fcef2cdc0ebc35802c635062fd1b7367004 (diff)
parent9cca88eb9261587875cc944a23811c9f1e62f492 (diff)
downloadgodot-7b75658bb266a8b79b4fff0d883d81600c3d37ba.tar.gz
godot-7b75658bb266a8b79b4fff0d883d81600c3d37ba.tar.zst
godot-7b75658bb266a8b79b4fff0d883d81600c3d37ba.zip
Merge pull request #1585 from UsernameIsAReservedWord/add_is_queued_for_deletion_in_objects
add : bool Object.is_queued_for_deletion()
Diffstat (limited to 'core/object.cpp')
-rw-r--r--core/object.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/core/object.cpp b/core/object.cpp
index 2b83f728d..f71521a0f 100644
--- a/core/object.cpp
+++ b/core/object.cpp
@@ -1503,6 +1503,8 @@ void Object::_bind_methods() {
ObjectTypeDB::bind_method(_MD("XL_MESSAGE","message"),&Object::XL_MESSAGE);
ObjectTypeDB::bind_method(_MD("tr","message"),&Object::tr);
+ ObjectTypeDB::bind_method(_MD("is_queued_for_deletion"),&Object::is_queued_for_deletion);
+
ADD_SIGNAL( MethodInfo("script_changed"));
BIND_VMETHOD( MethodInfo("_notification",PropertyInfo(Variant::INT,"what")) );
@@ -1566,6 +1568,10 @@ void Object::get_translatable_strings(List<String> *p_strings) const {
}
+bool Object::is_queued_for_deletion() const {
+ return _is_queued_for_deletion;
+}
+
#ifdef TOOLS_ENABLED
void Object::set_edited(bool p_edited) {
@@ -1587,6 +1593,7 @@ Object::Object() {
_instance_ID=0;
_instance_ID = ObjectDB::add_instance(this);
_can_translate=true;
+ _is_queued_for_deletion=false;
script_instance=NULL;
#ifdef TOOLS_ENABLED