Fix/improve property evaluator

Evolution of #10366 based on what has been discussed there. Now you can refer to the relevant object either by `self` or `s`. No conflicts with a potential `tool` script attached to the object. Proper cleanup since a dummy object is used to have an instance and the temporary script dies with it.

Fix/improve property evaluator
fcf52303 · Pedro J. Estébanez · 19aff15a · fcf52303
Commit fcf52303 authored Aug 17, 2017 by Pedro J. Estébanez
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 7 deletions

property_editor.cpp editor/property_editor.cpp +7 -7

No files found.
--- a/editor/property_editor.cpp
+++ b/editor/property_editor.cpp
@@ -4774,19 +4774,20 @@ double PropertyValueEvaluator::eval(const String &p_text) {
 		return _default_eval(p_text);
 	}

-	ScriptInstance *script_instance = script->instance_create(obj);
+	Object dummy;
+	ScriptInstance *script_instance = script->instance_create(&dummy);
 	if (!script_instance)
 		return _default_eval(p_text);

 	Variant::CallError call_err;
-	double result = script_instance->call("e", NULL, 0, call_err);
+	Variant arg = obj;
+	const Variant *args[] = { &arg };
+	double result = script_instance->call("eval", args, 1, call_err);
 	if (call_err.error == Variant::CallError::CALL_OK) {
 		return result;
 	}
 	print_line("[PropertyValueEvaluator]: Error eval! Error code: " + itos(call_err.error));

-	memdelete(script_instance);
-
 	return _default_eval(p_text);
 }

@@ -4795,9 +4796,8 @@ void PropertyValueEvaluator::edit(Object *p_obj) {
 }

 String PropertyValueEvaluator::_build_script(const String &p_text) {
-	String script_text = "tool\nextends Object\nfunc e():\n\treturn ";
-	script_text += p_text.strip_edges();
-	script_text += "\n";
+	String script_text =
+			"tool\nextends Object\nfunc eval(s):\n\tself = s\n\treturn " + p_text.strip_edges() + "\n";
 	return script_text;
 }