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

Fix invalid property hint for max_renderable_elements project setting #44435

Merged
merged 1 commit into from
Dec 16, 2020
Merged

Fix invalid property hint for max_renderable_elements project setting #44435

merged 1 commit into from
Dec 16, 2020

Conversation

Calinou
Copy link
Member

@Calinou Calinou commented Dec 16, 2020 •
edited
Loading

This closes #36240 and closes #35447 (supersedes it for 3.2).

@Calinou Calinou requested review from reduz and a team as code owners December 16, 2020 17:01
@Calinou Calinou added this to the 3.2 milestone Dec 16, 2020
clayjohn
clayjohn reviewed Dec 16, 2020
View reviewed changes
doc/classes/ProjectSettings.xml Outdated Show resolved Hide resolved
doc/classes/ProjectSettings.xml Outdated Show resolved Hide resolved
doc/classes/ProjectSettings.xml Outdated Show resolved Hide resolved
@Calinou Calinou force-pushed the fix-max-renderable-elements-hint branch from 598ebd3 to d6021c5 Compare December 16, 2020 17:31
clayjohn
clayjohn approved these changes Dec 16, 2020
View reviewed changes
Copy link
Member

@clayjohn clayjohn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good once CI passes. Looks like my suggestions introduced a trailing whitespace. Sorry. :(

@Calinou Calinou force-pushed the fix-max-renderable-elements-hint branch from d6021c5 to 680312b Compare December 16, 2020 18:33
@akien-mga akien-mga merged commit 9710a38 into godotengine:3.2 Dec 16, 2020
@akien-mga
Copy link
Member

Thanks!

@akien-mga akien-mga mentioned this pull request Dec 16, 2020
Closed
@akien-mga
Copy link
Member

closes #44435 (supersedes it for 3.2).

That's a self-reference, which issue/PR did you mean to link and close?

@Calinou Calinou mentioned this pull request Dec 16, 2020
Closed
@Calinou
Copy link
Member Author

Calinou commented Dec 16, 2020 •
edited
Loading

That's a self-reference, which issue/PR did you mean to link and close?

Sorry, I meant to close #35447.

@Calinou Calinou mentioned this pull request Dec 16, 2020
Closed
@haasanen
Copy link
Contributor

This PR replaces a hard-coded value by a different hard-coded value.
#35447 removes the hard-coded value by a variable that can be changed through the editor and thus this PR cannot supersede or fix the PR this claims to close.

@Calinou Calinou deleted the fix-max-renderable-elements-hint branch March 31, 2021 09:41
@akien-mga akien-mga modified the milestones: 3.2, 3.3 Apr 20, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@clayjohn clayjohn clayjohn approved these changes

@reduz reduz Awaiting requested review from reduz

Assignees
No one assigned
Labels
bug documentation topic:editor topic:rendering
Projects
None yet
Milestone
3.3
Development

Successfully merging this pull request may close these issues.
4 participants
@Calinou @akien-mga @haasanen @clayjohn