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

Remove toggling of unique names in subscenes #83370

Merged
merged 1 commit into from
Oct 28, 2023

Conversation

SaracenOne
Copy link
Member

@SaracenOne SaracenOne commented Oct 15, 2023

After some discussions, simply disallowing the ability to turn off the unique_name node flag in subscenes seems much more appropiate given how the system actually works. The unique name system works in the scope node ownership, so it does indeed make sense to disallow toggling it on the subscenes.

Deprecates previous attempt of fixing it here #82545

@timothyqiu
Copy link
Member

  • Toggle option in the right click menu should also be removed when appropriate.
  • For the unique name button in the tree, I think it's better to disable it instead of reporting an error when clicked.

@SaracenOne SaracenOne force-pushed the unique_name_subscene branch from ef93b28 to 439e008 Compare October 15, 2023 12:31
@SaracenOne
Copy link
Member Author

Good thinking. Fixed! Though for the first issue you raised, the editor already does this, the ability to toggle the unique name off via the icon being a janky incongruity

@fire fire requested review from KoBeWi and a team October 27, 2023 20:18
@KoBeWi
Copy link
Member

KoBeWi commented Oct 27, 2023

It's still possible to toggle unique name using shortcut.

@SaracenOne SaracenOne force-pushed the unique_name_subscene branch from 439e008 to 479d71d Compare October 28, 2023 01:51
@SaracenOne SaracenOne requested a review from a team as a code owner October 28, 2023 01:51
@SaracenOne
Copy link
Member Author

Good catch, I forgot about the shortcut since I don't think it's assigned by default. I've added the correct handling to the tool_selected case now. It will now simply disallow any toggling to unowned nodes. It will also only pop up the error dialog if ALL the nodes in the selection are unowned by the edited scene. I think this is the right call since it will still allow big batch converts on the entire scene even if a couple of editable children get caught in the selection.

@SaracenOne SaracenOne force-pushed the unique_name_subscene branch from 479d71d to 29c2615 Compare October 28, 2023 01:55
@akien-mga akien-mga merged commit e7a25b2 into godotengine:master Oct 28, 2023
15 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.

4 participants