Selaa lähdekoodia

Merge pull request #6403 from ISylvox/fix-export-templates

Fix for Compiling Export Templates
Rémi Verschelde 9 vuotta sitten
vanhempi
commit
4b9dac87f5

+ 2 - 1
modules/visual_script/visual_script.cpp

@@ -1130,6 +1130,7 @@ void VisualScript::get_script_property_list(List<PropertyInfo> *p_list) const {
 	}
 }
 
+#ifdef TOOLS_ENABLED
 bool VisualScript::are_subnodes_edited() const {
 
 	for(const Map<StringName,Function>::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) {
 

+ 2 - 0
modules/visual_script/visual_script.h

@@ -344,7 +344,9 @@ public:
 
 	virtual void get_script_property_list(List<PropertyInfo> *p_list) const;
 
+#ifdef TOOLS_ENABLED
 	virtual bool are_subnodes_edited() const;
+#endif
 
 	VisualScript();
 	~VisualScript();

+ 1 - 1
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;
 	}