asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #27320 from karroffel/gdnative-terminate-error-print

Browse source 
[GDNative] various NativeScript fixes around editor functionality
This commit is contained in:
Thomas Herzog 2019-03-25 08:07:59 +01:00 committed by GitHub
commit 81292665d5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
modules/gdnative/nativescript/nativescript.cpp
View file

@ -160,8 +160,10 @@ bool NativeScript::can_instance() const {
NativeScriptDesc *script_data = get_script_desc();
#ifdef TOOLS_ENABLED
return script_data || (!is_tool() && !ScriptServer::is_scripting_enabled());
// Only valid if this is either a tool script or a "regular" script.
// (so an environment whre scripting is disabled (and not the editor) would not
// create objects).
return script_data && (is_tool() || ScriptServer::is_scripting_enabled());
#else
return script_data;
#endif
@ -199,25 +201,6 @@ ScriptInstance *NativeScript::instance_create(Object *p_this) {
return NULL;
}
#ifdef TOOLS_ENABLED
if (!ScriptServer::is_scripting_enabled() && !is_tool()) {
// placeholder for nodes. For tools we want the rool thing.
PlaceHolderScriptInstance *sins = memnew(PlaceHolderScriptInstance(NSL, Ref<Script>(this), p_this));
placeholders.insert(sins);
if (script_data->create_func.create_func) {
script_data->create_func.create_func(
(godot_object *)p_this,
script_data->create_func.method_data);
}
_update_placeholder(sins);
return sins;
}
#endif
NativeScriptInstance *nsi = memnew(NativeScriptInstance);
nsi->owner = p_this;
@ -246,6 +229,19 @@ ScriptInstance *NativeScript::instance_create(Object *p_this) {
return nsi;
}
PlaceHolderScriptInstance *NativeScript::placeholder_instance_create(Object *p_this) {
#ifdef TOOLS_ENABLED
PlaceHolderScriptInstance *sins = memnew(PlaceHolderScriptInstance(NSL, Ref<Script>(this), p_this));
placeholders.insert(sins);
_update_placeholder(sins);
return sins;
#else
return NULL;
#endif
}
bool NativeScript::instance_has(const Object *p_this) const {
return instance_owners.has((Object *)p_this);
}
@ -1691,7 +1687,7 @@ void NativeReloadNode::_notification(int p_what) {
// since singleton libraries are not unloaded there is no point
// in loading them again.
if (!gdn->get_library()->is_singleton()) {
if (gdn->get_library()->is_singleton()) {
continue;
}

1
modules/gdnative/nativescript/nativescript.h
View file

@ -149,6 +149,7 @@ public:
virtual StringName get_instance_base_type() const; // this may not work in all scripts, will return empty if so
virtual ScriptInstance *instance_create(Object *p_this);
virtual PlaceHolderScriptInstance *placeholder_instance_create(Object *p_this);
virtual bool instance_has(const Object *p_this) const;
virtual bool has_source_code() const;