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

Merge pull request #10366 from RandomShaper/revive-prop-eval

Browse source 
Revive inspector property evaluation
This commit is contained in:
Rémi Verschelde 2017-08-16 16:32:29 +02:00 committed by GitHub
commit 6abb7bd13b
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
editor/property_editor.cpp
View file

@ -4774,12 +4774,11 @@ double PropertyValueEvaluator::eval(const String &p_text) {
return _default_eval(p_text); return _default_eval(p_text);
} }
ScriptInstance *script_instance = script->instance_create(this); ScriptInstance *script_instance = script->instance_create(obj);
if (!script_instance) if (!script_instance)
return _default_eval(p_text); return _default_eval(p_text);
Variant::CallError call_err; Variant::CallError call_err;
script_instance->call("set_this", obj);
double result = script_instance->call("e", NULL, 0, call_err); double result = script_instance->call("e", NULL, 0, call_err);
if (call_err.error == Variant::CallError::CALL_OK) { if (call_err.error == Variant::CallError::CALL_OK) {
return result; return result;
@ -4796,7 +4795,7 @@ void PropertyValueEvaluator::edit(Object *p_obj) {
} }
String PropertyValueEvaluator::_build_script(const String &p_text) { String PropertyValueEvaluator::_build_script(const String &p_text) {
String script_text = "tool\nvar this\nfunc set_this(p_this):\n\tthis=p_this\nfunc e():\n\treturn "; String script_text = "tool\nextends Object\nfunc e():\n\treturn ";
script_text += p_text.strip_edges(); script_text += p_text.strip_edges();
script_text += "\n"; script_text += "\n";
return script_text; return script_text;

2
modules/gdscript/gd_script.cpp
View file

@ -615,7 +615,7 @@ Error GDScript::reload(bool p_keep_state) {
if (basedir != "") if (basedir != "")
basedir = basedir.get_base_dir(); basedir = basedir.get_base_dir();
if (basedir.find("res://") == -1 && basedir.find("user://") == -1) { if (basedir != "" && basedir.find("res://") == -1 && basedir.find("user://") == -1) {
//loading a template, don't parse //loading a template, don't parse
return OK; return OK;
} }