diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-04-07 20:14:51 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-04-07 20:14:51 -0300 |
| commit | 7b75658bb266a8b79b4fff0d883d81600c3d37ba (patch) | |
| tree | 1274cb7c4d0a631dfe0199569b779a9362c23e50 /scene/main | |
| parent | b1bf4fcef2cdc0ebc35802c635062fd1b7367004 (diff) | |
| parent | 9cca88eb9261587875cc944a23811c9f1e62f492 (diff) | |
Merge pull request #1585 from UsernameIsAReservedWord/add_is_queued_for_deletion_in_objects
add : bool Object.is_queued_for_deletion()
Diffstat (limited to 'scene/main')
| -rw-r--r-- | scene/main/scene_main_loop.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scene/main/scene_main_loop.cpp b/scene/main/scene_main_loop.cpp index ed3e419359..8e2dc93288 100644 --- a/scene/main/scene_main_loop.cpp +++ b/scene/main/scene_main_loop.cpp @@ -850,6 +850,7 @@ void SceneTree::queue_delete(Object *p_object) { _THREAD_SAFE_METHOD_ ERR_FAIL_NULL(p_object); + p_object->_is_queued_for_deletion = true; delete_queue.push_back(p_object->get_instance_ID()); } |