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

Merge pull request #40573 from asmaloney/3.2-no-override 

Remove override keyword from csharp_script.h to fix build errors
This commit is contained in:
Rémi Verschelde 2020-07-21 20:09:54 +02:00 committed by GitHub
parent 7b4b83e9dc 502a3d580f
commit be30437e07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/mono/csharp_script.h
View File

@ -179,7 +179,7 @@ public:
virtual void get_script_property_list(List<PropertyInfo> *p_list) const; virtual void get_script_property_list(List<PropertyInfo> *p_list) const;
virtual void update_exports(); virtual void update_exports();
void get_members(Set<StringName> *p_members) override; virtual void get_members(Set<StringName> *p_members);
virtual bool is_tool() const { return tool; } virtual bool is_tool() const { return tool; }
virtual bool is_valid() const { return valid; } virtual bool is_valid() const { return valid; }