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

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

Fix for Compiling Export Templates
This commit is contained in:
Rémi Verschelde 2016-09-06 07:47:14 +02:00 committed by GitHub
parent 6f7b2d277f 4aab004674
commit 4b9dac87f5
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/visual_script/visual_script.cpp
View File

@ -1130,6 +1130,7 @@ void VisualScript::get_script_property_list(List<PropertyInfo> *p_list) const {
} }
} }
#ifdef TOOLS_ENABLED
bool VisualScript::are_subnodes_edited() const { bool VisualScript::are_subnodes_edited() const {
for(const Map<StringName,Function>::Element *E=functions.front();E;E=E->next()) { 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; return false;
} }
#endif
void VisualScript::_set_data(const Dictionary& p_data) { void VisualScript::_set_data(const Dictionary& p_data) {

2
modules/visual_script/visual_script.h
View File

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

2
modules/visual_script/visual_script_expression.cpp
View File

@ -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_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; r_error.error=Variant::CallError::CALL_ERROR_INVALID_METHOD;
#endif
} }
#endif
return 0; return 0;
} }