diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/core_string_names.cpp | 7 | ||||
| -rw-r--r-- | core/core_string_names.h | 5 | ||||
| -rw-r--r-- | core/variant/variant.h | 8 |
3 files changed, 7 insertions, 13 deletions
diff --git a/core/core_string_names.cpp b/core/core_string_names.cpp index 1ffe76495d..9bf625cc15 100644 --- a/core/core_string_names.cpp +++ b/core/core_string_names.cpp @@ -42,10 +42,8 @@ CoreStringNames::CoreStringNames() : _iter_get(StaticCString::create("_iter_get")), get_rid(StaticCString::create("get_rid")), _to_string(StaticCString::create("_to_string")), -#ifdef TOOLS_ENABLED - _sections_unfolded(StaticCString::create("_sections_unfolded")), -#endif _custom_features(StaticCString::create("_custom_features")), + x(StaticCString::create("x")), y(StaticCString::create("y")), z(StaticCString::create("z")), @@ -68,11 +66,10 @@ CoreStringNames::CoreStringNames() : g8(StaticCString::create("g8")), b8(StaticCString::create("b8")), a8(StaticCString::create("a8")), + call(StaticCString::create("call")), call_deferred(StaticCString::create("call_deferred")), bind(StaticCString::create("bind")), - unbind(StaticCString::create("unbind")), - emit(StaticCString::create("emit")), notification(StaticCString::create("notification")), property_list_changed(StaticCString::create("property_list_changed")) { } diff --git a/core/core_string_names.h b/core/core_string_names.h index d7ddc39f5e..d4ba9110c3 100644 --- a/core/core_string_names.h +++ b/core/core_string_names.h @@ -59,9 +59,6 @@ public: StringName _iter_get; StringName get_rid; StringName _to_string; -#ifdef TOOLS_ENABLED - StringName _sections_unfolded; -#endif StringName _custom_features; StringName x; @@ -90,8 +87,6 @@ public: StringName call; StringName call_deferred; StringName bind; - StringName unbind; - StringName emit; StringName notification; StringName property_list_changed; }; diff --git a/core/variant/variant.h b/core/variant/variant.h index 6494313722..f352af24da 100644 --- a/core/variant/variant.h +++ b/core/variant/variant.h @@ -165,10 +165,12 @@ private: friend struct _VariantCall; friend class VariantInternal; - // Variant takes 20 bytes when real_t is float, and 36 if double - // it only allocates extra memory for aabb/matrix. + // Variant takes 24 bytes when real_t is float, and 40 bytes if double. + // It only allocates extra memory for AABB/Transform2D (24, 48 if double), + // Basis/Transform3D (48, 96 if double), Projection (64, 128 if double), + // and PackedArray/Array/Dictionary (platform-dependent). - Type type; + Type type = NIL; struct ObjData { ObjectID id; |