diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2019-09-24 15:44:37 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-24 15:44:37 +0200 |
commit | e95e847c015b0612d494f68ef308137fbaf74a7e (patch) | |
tree | 4fb8637df60c721e17f09bd8402174425e1b1cc9 /modules/mono/editor/bindings_generator.h | |
parent | 9a327998f448ddaaa43881ac7bc03ac658538672 (diff) | |
parent | 97143e60c10488adf1b8fce8d3426b1ab2e578cc (diff) |
Merge pull request #32307 from neikeq/mesege
Fix wrong defval in EditorSpatialGizmo.add_mesh method bind
Diffstat (limited to 'modules/mono/editor/bindings_generator.h')
-rw-r--r-- | modules/mono/editor/bindings_generator.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/modules/mono/editor/bindings_generator.h b/modules/mono/editor/bindings_generator.h index 6f0c297575..26718f1d11 100644 --- a/modules/mono/editor/bindings_generator.h +++ b/modules/mono/editor/bindings_generator.h @@ -472,6 +472,7 @@ class BindingsGenerator { }; bool log_print_enabled; + bool initialized; OrderedHashMap<StringName, TypeInterface> obj_types; @@ -502,6 +503,7 @@ class BindingsGenerator { StringName type_VarArg; StringName type_Object; StringName type_Reference; + StringName type_RID; StringName type_String; StringName type_at_GlobalScope; StringName enum_Error; @@ -525,6 +527,7 @@ class BindingsGenerator { type_VarArg = StaticCString::create("VarArg"); type_Object = StaticCString::create("Object"); type_Reference = StaticCString::create("Reference"); + type_RID = StaticCString::create("RID"); type_String = StaticCString::create("String"); type_at_GlobalScope = StaticCString::create("@GlobalScope"); enum_Error = StaticCString::create("Error"); @@ -590,9 +593,9 @@ class BindingsGenerator { StringName _get_int_type_name_from_meta(GodotTypeInfo::Metadata p_meta); StringName _get_float_type_name_from_meta(GodotTypeInfo::Metadata p_meta); - void _default_argument_from_variant(const Variant &p_val, ArgumentInterface &r_iarg); + bool _arg_default_value_from_variant(const Variant &p_val, ArgumentInterface &r_iarg); - void _populate_object_type_interfaces(); + bool _populate_object_type_interfaces(); void _populate_builtin_type_interfaces(); void _populate_global_constants(); @@ -621,12 +624,15 @@ public: _FORCE_INLINE_ bool is_log_print_enabled() { return log_print_enabled; } _FORCE_INLINE_ void set_log_print_enabled(bool p_enabled) { log_print_enabled = p_enabled; } + _FORCE_INLINE_ bool is_initialized() { return initialized; } + static uint32_t get_version(); static void handle_cmdline_args(const List<String> &p_cmdline_args); BindingsGenerator() : - log_print_enabled(true) { + log_print_enabled(true), + initialized(false) { _initialize(); } }; |