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.

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

Don't allow built-in scripts to use class_name #27876

Merged
merged 1 commit into from
Apr 11, 2019

Conversation

vnen
Copy link
Member

@vnen vnen commented Apr 9, 2019

Closes #25579

@akien-mga
Copy link
Member

That second commit is not relevant if you rebase on current master, I already committed those changes.

Sounds like you're all running Arch or similar and got clang-format 8.0 landing at once @JFonS @bojidar-bg and @vnen? :)

@JFonS
Copy link
Contributor

JFonS commented Apr 10, 2019

@akien-mga guilty... ✋

@vnen vnen force-pushed the gdscript-no-builtin-name branch from f91887e to e56f5d5 Compare April 10, 2019 21:05
@vnen
Copy link
Member Author

vnen commented Apr 10, 2019

Rebased. I guess I'm too bleeding edge with Arch.

@akien-mga akien-mga merged commit 10c7742 into godotengine:master Apr 11, 2019
@akien-mga
Copy link
Member

Thanks!

@vnen vnen deleted the gdscript-no-builtin-name branch April 11, 2019 22:51
@hpvb
Copy link
Member

hpvb commented Apr 20, 2019

Cherry-picked for 3.1.1.

@akien-mga
Copy link
Member

Reverted cherry-pick for now, there's a regression from this PR in #28002 which needs to be solved first.

To consider again for 3.1.2.

@akien-mga
Copy link
Member

The regression #28002 was fixed by #28099, which should thus be cherry-picked together with this PR.
For now, opting out of cherry-picking this to stay on the safe side.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

class_name won't work on built-in scripts
4 participants