fix release builds with mono
"_signals" and "signals_invalidated" were moved out of the
"TOOLS_ENABLED" directive. Updated also the two "update_signals" and
"_update_signals" methods so it makes sense.
(cherry picked from commit 3c7d9001bc
)
This commit is contained in:
parent
c730a6ce44
commit
990bddcf36
2 changed files with 3 additions and 8 deletions
|
@ -1550,7 +1550,6 @@ bool CSharpScript::_update_exports() {
|
||||||
}
|
}
|
||||||
|
|
||||||
bool CSharpScript::_update_signals() {
|
bool CSharpScript::_update_signals() {
|
||||||
#ifdef TOOLS_ENABLED
|
|
||||||
if (!valid)
|
if (!valid)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
@ -1581,8 +1580,6 @@ bool CSharpScript::_update_signals() {
|
||||||
}
|
}
|
||||||
|
|
||||||
return changed;
|
return changed;
|
||||||
#endif
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool CSharpScript::_get_signal(GDMonoClass *p_class, GDMonoClass *p_delegate, Vector<Argument> ¶ms) {
|
bool CSharpScript::_get_signal(GDMonoClass *p_class, GDMonoClass *p_delegate, Vector<Argument> ¶ms) {
|
||||||
|
@ -2135,9 +2132,7 @@ void CSharpScript::get_script_signal_list(List<MethodInfo> *r_signals) const {
|
||||||
}
|
}
|
||||||
|
|
||||||
void CSharpScript::update_signals() {
|
void CSharpScript::update_signals() {
|
||||||
#ifdef TOOLS_ENABLED
|
|
||||||
_update_signals();
|
_update_signals();
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Ref<Script> CSharpScript::get_base_script() const {
|
Ref<Script> CSharpScript::get_base_script() const {
|
||||||
|
|
|
@ -90,15 +90,15 @@ class CSharpScript : public Script {
|
||||||
Variant::Type type;
|
Variant::Type type;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Map<StringName, Vector<Argument> > _signals;
|
||||||
|
bool signals_invalidated;
|
||||||
|
|
||||||
#ifdef TOOLS_ENABLED
|
#ifdef TOOLS_ENABLED
|
||||||
List<PropertyInfo> exported_members_cache; // members_cache
|
List<PropertyInfo> exported_members_cache; // members_cache
|
||||||
Map<StringName, Variant> exported_members_defval_cache; // member_default_values_cache
|
Map<StringName, Variant> exported_members_defval_cache; // member_default_values_cache
|
||||||
Set<PlaceHolderScriptInstance *> placeholders;
|
Set<PlaceHolderScriptInstance *> placeholders;
|
||||||
bool source_changed_cache;
|
bool source_changed_cache;
|
||||||
bool exports_invalidated;
|
bool exports_invalidated;
|
||||||
Map<StringName, Vector<Argument> > _signals;
|
|
||||||
bool signals_invalidated;
|
|
||||||
|
|
||||||
void _update_exports_values(Map<StringName, Variant> &values, List<PropertyInfo> &propnames);
|
void _update_exports_values(Map<StringName, Variant> &values, List<PropertyInfo> &propnames);
|
||||||
virtual void _placeholder_erased(PlaceHolderScriptInstance *p_placeholder);
|
virtual void _placeholder_erased(PlaceHolderScriptInstance *p_placeholder);
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue