Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

C# scripts reload in editor fixed #52883

Merged
merged 1 commit into from
Sep 24, 2021
Merged

C# scripts reload in editor fixed #52883

merged 1 commit into from
Sep 24, 2021

Conversation

Germanrc
Copy link
Contributor

@Germanrc Germanrc commented Sep 21, 2021 •
edited by akien-mga
Loading

Co-authored-by: Michael Bickel mib@developium.net

This fixes the problem when trying to run the same script more than once in the editor (see #48590).
Originally started by in @dazKind in #48627. Changes were required to the merge the PR but unfortunatly he did not have the time to make them and the problem was never fixed. So I made the changes that were asked in his PR.

Bugsquad edit: Fixes #48590.

@Germanrc Germanrc requested a review from a team as a code owner September 21, 2021 00:43
@Calinou Calinou added this to the 3.4 milestone Sep 21, 2021
@Calinou Calinou mentioned this pull request Sep 21, 2021
Closed
Calinou
Calinou previously requested changes Sep 21, 2021
View reviewed changes
modules/mono/csharp_script.cpp Outdated Show resolved Hide resolved
modules/mono/csharp_script.cpp Outdated Show resolved Hide resolved
@Germanrc
Copy link
Contributor Author

Germanrc commented Sep 21, 2021 •
edited
Loading

Done! Code style should be fine now.

Edit: Seems like the clang formater was complaining about something, posibly a blank line but not sure. Changed it again.

@akien-mga
Copy link
Member

akien-mga commented Sep 21, 2021 •
edited
Loading

Looks good to me, but maybe you could amend the commit message to remove the mention to clang-format - passing style checks is the rule, not the exception, so it's not worth mentioning in the commit message.

@Germanrc @dazKind
C# script reload fixed
84a218d 
Co-authored-by: Michael Bickel <mib@developium.net>
@Germanrc
Copy link
Contributor Author

Any additional changes needed to merge this PR? It has been a few days since I commited the required changes. I am guessing this is several commits behind the official repo branch by now.

@akien-mga akien-mga merged commit 6e39566 into godotengine:3.x Sep 24, 2021
@akien-mga
Copy link
Member

Thanks!

This should likely be changed in master too?

@akien-mga akien-mga mentioned this pull request Sep 24, 2021
Closed
@Germanrc
Copy link
Contributor Author

Yes. I did not use master branch because C# is quite unstable right now, but it would be nice to have the fix in godot 4 too.

@Germanrc Germanrc deleted the script_reload_fix branch September 24, 2021 06:38
@neikeq
Copy link
Contributor

neikeq commented Sep 24, 2021

Whoops, I didn't realize this was made against the 3.x branch. It's needed in master too, but no hurries. I'll add it to my list just in case to not forget.

@akien-mga
Copy link
Member

Cherry-picked for 3.3.4.

@raulsntos raulsntos mentioned this pull request Dec 6, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@akien-mga akien-mga akien-mga approved these changes

@neikeq neikeq neikeq approved these changes

@Calinou Calinou Awaiting requested review from Calinou

Assignees
No one assigned
Labels
bug topic:dotnet topic:editor
Projects
None yet
Milestone
3.4
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@Germanrc @akien-mga @neikeq @Calinou