From 4aab004674df8bb0dbff8c1b4bda4cd7213c7348 Mon Sep 17 00:00:00 2001 From: ISylvox Date: Tue, 6 Sep 2016 04:50:30 +0700 Subject: [PATCH] Should Fix Compiling Export Templates - Works on Windows, Linux x11, Linux Server, Android, HTML5 - Not tested on Mac/iOS (don't have Apple's devices yet) --- modules/visual_script/visual_script.cpp | 3 ++- modules/visual_script/visual_script.h | 2 ++ modules/visual_script/visual_script_expression.cpp | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/visual_script/visual_script.cpp b/modules/visual_script/visual_script.cpp index 4de593760d..d0a933a11c 100644 --- a/modules/visual_script/visual_script.cpp +++ b/modules/visual_script/visual_script.cpp @@ -1130,6 +1130,7 @@ void VisualScript::get_script_property_list(List *p_list) const { } } +#ifdef TOOLS_ENABLED bool VisualScript::are_subnodes_edited() const { for(const Map::Element *E=functions.front();E;E=E->next()) { @@ -1143,7 +1144,7 @@ bool VisualScript::are_subnodes_edited() const { return false; } - +#endif void VisualScript::_set_data(const Dictionary& p_data) { diff --git a/modules/visual_script/visual_script.h b/modules/visual_script/visual_script.h index 794230d694..63b018b0c2 100644 --- a/modules/visual_script/visual_script.h +++ b/modules/visual_script/visual_script.h @@ -344,7 +344,9 @@ public: virtual void get_script_property_list(List *p_list) const; +#ifdef TOOLS_ENABLED virtual bool are_subnodes_edited() const; +#endif VisualScript(); ~VisualScript(); diff --git a/modules/visual_script/visual_script_expression.cpp b/modules/visual_script/visual_script_expression.cpp index 3cfb1c154e..b53e81f23f 100644 --- a/modules/visual_script/visual_script_expression.cpp +++ b/modules/visual_script/visual_script_expression.cpp @@ -1396,8 +1396,8 @@ public: r_error_str+="Can't convert expression result from "+Variant::get_type_name(p_outputs[0]->get_type())+" to "+Variant::get_type_name(expression->output_type)+"."; r_error.error=Variant::CallError::CALL_ERROR_INVALID_METHOD; -#endif } +#endif return 0; }