diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-06-09 00:23:50 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2017-06-09 00:24:18 -0300 |
| commit | 612ab8fcdb94bf0cd9d7b4a3006b4e4f76c9a13b (patch) | |
| tree | 1e7b4fdb8154098319b0c44ee0289288610a77c3 /core/object.h | |
| parent | 01ed55987c4c044191e50ecc94c277b97962ffc7 (diff) | |
| download | redot-engine-612ab8fcdb94bf0cd9d7b4a3006b4e4f76c9a13b.tar.gz | |
-Restored multithread capability to VisualServer
-Restored resource previews!
Diffstat (limited to 'core/object.h')
| -rw-r--r-- | core/object.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/object.h b/core/object.h index 3b39224af0..83b03b9239 100644 --- a/core/object.h +++ b/core/object.h @@ -350,7 +350,7 @@ public: \ private: class ScriptInstance; -typedef uint32_t ObjectID; +typedef uint64_t ObjectID; class Object { public: @@ -423,7 +423,7 @@ private: bool _block_signals; int _predelete_ok; Set<Object *> change_receptors; - uint32_t _instance_ID; + ObjectID _instance_ID; bool _predelete(); void _postinitialize(); bool _can_translate; @@ -690,16 +690,16 @@ class ObjectDB { } }; - static HashMap<uint32_t, Object *> instances; + static HashMap<ObjectID, Object *> instances; static HashMap<Object *, ObjectID, ObjectPtrHash> instance_checks; - static uint32_t instance_counter; + static ObjectID instance_counter; friend class Object; friend void unregister_core_types(); static RWLock *rw_lock; static void cleanup(); - static uint32_t add_instance(Object *p_object); + static ObjectID add_instance(Object *p_object); static void remove_instance(Object *p_object); friend void register_core_types(); static void setup(); @@ -707,7 +707,7 @@ class ObjectDB { public: typedef void (*DebugFunc)(Object *p_obj); - static Object *get_instance(uint32_t p_instance_ID); + static Object *get_instance(ObjectID p_instance_ID); static void debug_objects(DebugFunc p_func); static int get_object_count(); |