godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed remote inspector for tool scripts

Browse Source 
Fixes #29506
This commit is contained in:
PouleyKetchoupp 2019-10-28 18:18:43 +01:00
parent 7d710a745e
commit 3a26a0eaa7
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/ref_ptr.cpp
View File

@ -49,6 +49,14 @@ bool RefPtr::operator==(const RefPtr &p_other) const {
return *ref == *ref_other; return *ref == *ref_other;
} }
bool RefPtr::operator!=(const RefPtr &p_other) const {
Ref<Reference> *ref = reinterpret_cast<Ref<Reference> *>(&data[0]);
Ref<Reference> *ref_other = reinterpret_cast<Ref<Reference> *>(const_cast<char *>(&p_other.data[0]));
return *ref != *ref_other;
}
RefPtr::RefPtr(const RefPtr &p_other) { RefPtr::RefPtr(const RefPtr &p_other) {
memnew_placement(&data[0], Ref<Reference>); memnew_placement(&data[0], Ref<Reference>);

1
core/ref_ptr.h
View File

@ -50,6 +50,7 @@ public:
bool is_null() const; bool is_null() const;
void operator=(const RefPtr &p_other); void operator=(const RefPtr &p_other);
bool operator==(const RefPtr &p_other) const; bool operator==(const RefPtr &p_other) const;
bool operator!=(const RefPtr &p_other) const;
RID get_rid() const; RID get_rid() const;
void unref(); void unref();
_FORCE_INLINE_ void *get_data() const { return data; } _FORCE_INLINE_ void *get_data() const { return data; }

12
editor/script_editor_debugger.cpp
View File

@ -611,8 +611,16 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da
} }
var = ResourceLoader::load(path); var = ResourceLoader::load(path);
if (pinfo.hint_string == "Script") if (pinfo.hint_string == "Script") {
debugObj->set_script(var); if (debugObj->get_script() != var) {
debugObj->set_script(RefPtr());
Ref<Script> script(var);
if (!script.is_null()) {
ScriptInstance *script_instance = script->placeholder_instance_create(debugObj);
debugObj->set_script_and_instance(var, script_instance);
}
}
}
} else if (var.get_type() == Variant::OBJECT) { } else if (var.get_type() == Variant::OBJECT) {
if (((Object *)var)->is_class("EncodedObjectAsID")) { if (((Object *)var)->is_class("EncodedObjectAsID")) {
var = Object::cast_to<EncodedObjectAsID>(var)->get_object_id(); var = Object::cast_to<EncodedObjectAsID>(var)->get_object_id();