diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/gdnative/gdnative_api.json | 98 | ||||
| -rw-r--r-- | modules/gdscript/gdscript_function.cpp | 4 | ||||
| -rw-r--r-- | modules/visual_script/visual_script.cpp | 1 |
3 files changed, 52 insertions, 51 deletions
diff --git a/modules/gdnative/gdnative_api.json b/modules/gdnative/gdnative_api.json index 2f304ca49c..9e5295a936 100644 --- a/modules/gdnative/gdnative_api.json +++ b/modules/gdnative/gdnative_api.json @@ -91,6 +91,55 @@ ["const godot_int", "p_step"], ["const godot_bool", "p_deep"] ] + }, + { + "name": "godot_pool_byte_array_empty", + "return_type": "godot_bool", + "arguments": [ + ["const godot_pool_byte_array *", "p_self"] + ] + }, + { + "name": "godot_pool_int_array_empty", + "return_type": "godot_bool", + "arguments": [ + ["const godot_pool_int_array *", "p_self"] + ] + }, + { + "name": "godot_pool_real_array_empty", + "return_type": "godot_bool", + "arguments": [ + ["const godot_pool_real_array *", "p_self"] + ] + }, + { + "name": "godot_pool_string_array_empty", + "return_type": "godot_bool", + "arguments": [ + ["const godot_pool_string_array *", "p_self"] + ] + }, + { + "name": "godot_pool_vector2_array_empty", + "return_type": "godot_bool", + "arguments": [ + ["const godot_pool_vector2_array *", "p_self"] + ] + }, + { + "name": "godot_pool_vector3_array_empty", + "return_type": "godot_bool", + "arguments": [ + ["const godot_pool_vector3_array *", "p_self"] + ] + }, + { + "name": "godot_pool_color_array_empty", + "return_type": "godot_bool", + "arguments": [ + ["const godot_pool_color_array *", "p_self"] + ] } ] }, @@ -1717,13 +1766,6 @@ ] }, { - "name": "godot_pool_byte_array_empty", - "return_type": "godot_bool", - "arguments": [ - ["const godot_pool_byte_array *", "p_self"] - ] - }, - { "name": "godot_pool_byte_array_destroy", "return_type": "void", "arguments": [ @@ -1848,13 +1890,6 @@ ] }, { - "name": "godot_pool_int_array_empty", - "return_type": "godot_bool", - "arguments": [ - ["const godot_pool_int_array *", "p_self"] - ] - }, - { "name": "godot_pool_int_array_destroy", "return_type": "void", "arguments": [ @@ -1979,13 +2014,6 @@ ] }, { - "name": "godot_pool_real_array_empty", - "return_type": "godot_bool", - "arguments": [ - ["const godot_pool_real_array *", "p_self"] - ] - }, - { "name": "godot_pool_real_array_destroy", "return_type": "void", "arguments": [ @@ -2110,13 +2138,6 @@ ] }, { - "name": "godot_pool_string_array_empty", - "return_type": "godot_bool", - "arguments": [ - ["const godot_pool_string_array *", "p_self"] - ] - }, - { "name": "godot_pool_string_array_destroy", "return_type": "void", "arguments": [ @@ -2241,13 +2262,6 @@ ] }, { - "name": "godot_pool_vector2_array_empty", - "return_type": "godot_bool", - "arguments": [ - ["const godot_pool_vector2_array *", "p_self"] - ] - }, - { "name": "godot_pool_vector2_array_destroy", "return_type": "void", "arguments": [ @@ -2372,13 +2386,6 @@ ] }, { - "name": "godot_pool_vector3_array_empty", - "return_type": "godot_bool", - "arguments": [ - ["const godot_pool_vector3_array *", "p_self"] - ] - }, - { "name": "godot_pool_vector3_array_destroy", "return_type": "void", "arguments": [ @@ -2503,13 +2510,6 @@ ] }, { - "name": "godot_pool_color_array_empty", - "return_type": "godot_bool", - "arguments": [ - ["const godot_pool_color_array *", "p_self"] - ] - }, - { "name": "godot_pool_color_array_destroy", "return_type": "void", "arguments": [ diff --git a/modules/gdscript/gdscript_function.cpp b/modules/gdscript/gdscript_function.cpp index 83d02e4977..d8816726ce 100644 --- a/modules/gdscript/gdscript_function.cpp +++ b/modules/gdscript/gdscript_function.cpp @@ -1561,14 +1561,14 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a //error // function, file, line, error, explanation String err_file; - if (p_instance && p_instance->script->is_valid() && p_instance->script->path != "") + if (p_instance && ObjectDB::instance_validate(p_instance->owner) && p_instance->script->is_valid() && p_instance->script->path != "") err_file = p_instance->script->path; else if (script) err_file = script->path; if (err_file == "") err_file = "<built-in>"; String err_func = name; - if (p_instance && p_instance->script->is_valid() && p_instance->script->name != "") + if (p_instance && ObjectDB::instance_validate(p_instance->owner) && p_instance->script->is_valid() && p_instance->script->name != "") err_func = p_instance->script->name + "." + err_func; int err_line = line; if (err_text == "") { diff --git a/modules/visual_script/visual_script.cpp b/modules/visual_script/visual_script.cpp index 0cacd0f0b5..bb8612af6f 100644 --- a/modules/visual_script/visual_script.cpp +++ b/modules/visual_script/visual_script.cpp @@ -1361,6 +1361,7 @@ void VisualScript::_bind_methods() { VisualScript::VisualScript() { base_type = "Object"; + is_tool_script = false; } StringName VisualScript::get_default_func() const { |