diff options
| -rw-r--r-- | modules/gdscript/gd_editor.cpp | 24 | ||||
| -rw-r--r-- | scene/resources/packed_scene.cpp | 1 |
2 files changed, 24 insertions, 1 deletions
diff --git a/modules/gdscript/gd_editor.cpp b/modules/gdscript/gd_editor.cpp index 126a8cd1eb..8dfb55a6b6 100644 --- a/modules/gdscript/gd_editor.cpp +++ b/modules/gdscript/gd_editor.cpp @@ -285,6 +285,30 @@ void GDScriptLanguage::get_public_functions(List<MethodInfo> *p_functions) const p_functions->push_back(GDFunctions::get_info(GDFunctions::Function(i))); } + + //not really "functions", but.. + { + MethodInfo mi; + mi.name="preload:Resource"; + mi.arguments.push_back(PropertyInfo(Variant::STRING,"path")); + mi.return_val=PropertyInfo(Variant::OBJECT,"",PROPERTY_HINT_RESOURCE_TYPE,"Resource"); + p_functions->push_back(mi); + } + { + MethodInfo mi; + mi.name="yield"; + mi.arguments.push_back(PropertyInfo(Variant::OBJECT,"object")); + mi.arguments.push_back(PropertyInfo(Variant::STRING,"signal")); + mi.default_arguments.push_back(Variant::NIL); + mi.default_arguments.push_back(Variant::STRING); + p_functions->push_back(mi); + } + { + MethodInfo mi; + mi.name="assert"; + mi.arguments.push_back(PropertyInfo(Variant::BOOL,"condition")); + p_functions->push_back(mi); + } } void GDScriptLanguage::get_public_constants(List<Pair<String,Variant> > *p_constants) const { diff --git a/scene/resources/packed_scene.cpp b/scene/resources/packed_scene.cpp index 2377d22007..4c23ddbaf7 100644 --- a/scene/resources/packed_scene.cpp +++ b/scene/resources/packed_scene.cpp @@ -239,7 +239,6 @@ Node *SceneState::instance(bool p_gen_edit_state) const { } else { node->_set_name_nocheck( snames[ n.name ] ); } - } if (n.owner>=0) { |