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

Fix crash when adding scenes with a group to the level scene #94450

Merged
merged 1 commit into from
Jul 19, 2024

Conversation

jamie-pate
Copy link
Contributor

Fixes #94274

@KoBeWi
Copy link
Member

KoBeWi commented Jul 18, 2024

It does not fix the crash, because you did not delete the _update_groups() call...

Also you can just do an early return at the beginning:

if (!scene_root_node) {
	return;
}

@akien-mga akien-mga changed the title Fix Crash when adding scenes with a group to the level scene Fix crash when adding scenes with a group to the level scene Jul 18, 2024
@jamie-pate
Copy link
Contributor Author

Oops, messed up which lines to stage when committing, that extra line wasn't there when I was testing it obviously :D

@AThousandShips
Copy link
Member

Please squash your commits into one, see here

@jamie-pate
Copy link
Contributor Author

I was going to do that, then I read that you can just set github to do it for you on all PRs.. so I'd hoped that was the case

@Calinou
Copy link
Member

Calinou commented Jul 19, 2024

I was going to do that, then I read that you can just set github to do it for you on all PRs.. so I'd hoped that was the case

We don't use GitHub's squash and merge feature on the main Godot repository, since it loses the merge commit in the process. We prefer keeping the merge commit to make the Git history more self-documented (even if that makes it longer when not using the --no-merges option).

@akien-mga akien-mga merged commit 2549205 into godotengine:master Jul 19, 2024
18 checks passed
@akien-mga
Copy link
Member

Thanks!

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.

Crash when adding scenes with a group to the level scene
5 participants