diff options
| author | Thomas Herzog <karroffel@users.noreply.github.com> | 2017-04-11 02:25:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-11 02:25:18 +0200 |
| commit | 09ed1113fa78d31c72341c2b3550e554e728b1f3 (patch) | |
| tree | cd0a676617c3d8d92994e0cb93bd948d6f3503f0 | |
| parent | 200c84b6b2c7557d83ec9f22fa4e995e5fc08167 (diff) | |
| parent | 544940c1752d3b3b567a21c8753a7089beea4156 (diff) | |
Merge pull request #8352 from karroffel/gdnative-misc-fixes
[GDNative] misc fixes
| -rw-r--r-- | modules/gdnative/api_generator.cpp | 1 | ||||
| -rw-r--r-- | modules/gdnative/gdnative.cpp | 2 | ||||
| -rw-r--r-- | modules/gdnative/godot.h | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/modules/gdnative/api_generator.cpp b/modules/gdnative/api_generator.cpp index 8569ae078e..d5f22ee7a3 100644 --- a/modules/gdnative/api_generator.cpp +++ b/modules/gdnative/api_generator.cpp @@ -402,6 +402,7 @@ static List<String> generate_c_api_json(const List<ClassAPI> &p_api) { source.push_back("\t\t\t\t\t{\n"); source.push_back("\t\t\t\t\t\t\"name\": \"" + e->get().argument_names[i] + "\",\n"); source.push_back("\t\t\t\t\t\t\"type\": \"" + e->get().argument_types[i] + "\",\n"); + source.push_back(String("\t\t\t\t\t\t\"has_default_value\": ") + (e->get().default_arguments.has(i) ? "true" : "false") + ",\n"); source.push_back("\t\t\t\t\t\t\"default_value\": \"" + (e->get().default_arguments.has(i) ? (String)e->get().default_arguments[i] : "") + "\"\n"); source.push_back(String("\t\t\t\t\t}") + ((i < e->get().argument_names.size() - 1) ? "," : "") + "\n"); } diff --git a/modules/gdnative/gdnative.cpp b/modules/gdnative/gdnative.cpp index f646060d49..b543a486d3 100644 --- a/modules/gdnative/gdnative.cpp +++ b/modules/gdnative/gdnative.cpp @@ -77,11 +77,9 @@ Error NativeLibrary::initialize(NativeLibrary *&p_native_lib, const StringName p godot_native_init_options options; options.in_editor = SceneTree::get_singleton()->is_editor_hint(); - /* options.core_api_hash = ClassDB::get_api_hash(ClassDB::API_CORE); options.editor_api_hash = ClassDB::get_api_hash(ClassDB::API_EDITOR); options.no_api_hash = ClassDB::get_api_hash(ClassDB::API_NONE); - */ library_init_fpointer(&options); // Catch errors? diff --git a/modules/gdnative/godot.h b/modules/gdnative/godot.h index bba0a3f98d..0d7aece23b 100644 --- a/modules/gdnative/godot.h +++ b/modules/gdnative/godot.h @@ -317,7 +317,7 @@ typedef struct godot_instance_create_func { void *(*create_func)(godot_object *, void *); void *method_data; void (*free_func)(void *); -} godot_script_instance_func; +} godot_instance_create_func; typedef struct godot_instance_destroy_func { // instance pointer, method data, user data |