diff options
| author | George L. Albany <Megacake1234@gmail.com> | 2024-11-26 19:30:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-26 19:30:58 +0000 |
| commit | b06d20bf39d15ec736d08d4e4fcb32e0c3c1ce1e (patch) | |
| tree | 79c2a4c34f2d888ff962d76edf474c518d1abdea /core/variant/variant.h | |
| parent | c5b1645e60a59c0292c04bece3fdb0715a61afea (diff) | |
| parent | e58e18261ea7ed3978146ef8d77a900be2601be3 (diff) | |
| download | redot-engine-b06d20bf39d15ec736d08d4e4fcb32e0c3c1ce1e.tar.gz | |
Merge pull request #885 from Spartan322/merge/d09d82d
Merge commit godotengine/godot@d09d82d
Diffstat (limited to 'core/variant/variant.h')
| -rw-r--r-- | core/variant/variant.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/variant/variant.h b/core/variant/variant.h index 9fd0472550..de0d763246 100644 --- a/core/variant/variant.h +++ b/core/variant/variant.h @@ -794,7 +794,6 @@ public: String stringify(int recursion_count = 0) const; String to_json_string() const; - void static_assign(const Variant &p_variant); static void get_constants_for_type(Variant::Type p_type, List<StringName> *p_constants); static int get_constants_count_for_type(Variant::Type p_type); static bool has_constant(Variant::Type p_type, const StringName &p_value); @@ -803,6 +802,8 @@ public: static void get_enums_for_type(Variant::Type p_type, List<StringName> *p_enums); static void get_enumerations_for_enum(Variant::Type p_type, const StringName &p_enum_name, List<StringName> *p_enumerations); static int get_enum_value(Variant::Type p_type, const StringName &p_enum_name, const StringName &p_enumeration, bool *r_valid = nullptr); + static bool has_enum(Variant::Type p_type, const StringName &p_enum_name); + static StringName get_enum_for_enumeration(Variant::Type p_type, const StringName &p_enumeration); typedef String (*ObjectDeConstruct)(const Variant &p_object, void *ud); typedef void (*ObjectConstruct)(const String &p_text, void *ud, Variant &r_value); |