summaryrefslogtreecommitdiff
path: root/core/object.h
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2014-04-05 12:39:30 -0300
committerJuan Linietsky <reduzio@gmail.com>2014-04-05 12:39:30 -0300
commit9f33134c93ecbadda70e8eefc50563e29b2eb7f2 (patch)
tree299ded94fe74a61bf8094935d0f3283f6f30e435 /core/object.h
parent35b84d2c85fd152bee05d7d5a05e20a5f602a285 (diff)
-Support for changing fonts
-Detect when free() might crash the project and throw error -fixed 2D Bounce in physics (3d still broken) -renamed “on_top” property to “behind_parent”, which makes more sense, old on_top remains there for compatibility but is invisible. -large amount of fixes
Diffstat (limited to 'core/object.h')
-rw-r--r--core/object.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/core/object.h b/core/object.h
index 913d837172..6290f9d64b 100644
--- a/core/object.h
+++ b/core/object.h
@@ -331,7 +331,9 @@ public:
Connection(const Variant& p_variant);
};
private:
-
+#ifdef DEBUG_ENABLED
+friend class _ObjectDebugLock;
+#endif
friend bool predelete_handler(Object*);
friend void postinitialize_handler(Object*);
@@ -365,7 +367,9 @@ friend void postinitialize_handler(Object*);
HashMap< StringName, Signal, StringNameHasher> signal_map;
List<Connection> connections;
-
+#ifdef DEBUG_ENABLED
+ SafeRefCount _lock_index;
+#endif
bool _block_signals;
int _predelete_ok;
Set<Object*> change_receptors;