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

Fixes #15470 "Crash on drag and drop scene file on empty scene" #15516

Merged
merged 1 commit into from
Jan 10, 2018
Merged

Fixes #15470 "Crash on drag and drop scene file on empty scene" #15516

merged 1 commit into from
Jan 10, 2018

Conversation

bfloch
Copy link
Contributor

@bfloch bfloch commented Jan 9, 2018 •
edited
Loading

Fixes #15470

  • New: Allows for multiple files to be dragged over
  • Added error when multiple nodes are dropped in scene without scene root
    • Removed TTR: "This operation requires a single selected node.", "I see.."
    • Introduces TTR: "Can not instaniate multiple nodes without root."
  • Fixes "Can't add_child, already got a parent" error
  • Reduced multiple resource loading by casting
  • Make sure to not _show_resource_type_selector if only PackedScenes are being dropped

@bfloch bfloch changed the title - Fixes #15470 "Crash on drag and drop scene file on empty scene" Fixes #15470 "Crash on drag and drop scene file on empty scene" Jan 9, 2018
@akien-mga akien-mga added this to the 3.0 milestone Jan 9, 2018
akien-mga
akien-mga reviewed Jan 9, 2018
View reviewed changes
editor/plugins/canvas_item_editor_plugin.cpp Outdated
// Without root dropping multiple files is not allowed
if (!target_node && selected_files.size() > 1) {
accept->get_ok()->set_text(TTR("Ok"));
accept->set_text(TTR("Can not instaniate multiple nodes without root."));
Copy link
Member

Choose a reason for hiding this comment

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

*instantiate

Copy link
Member

Choose a reason for hiding this comment

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

And I would use "Cannot".

@bfloch
- Fixes godotengine#15470 "Crash on drag and drop scene file on empty…
9d4afdc 
… scene"

- New: Allows for multiple files to be dragged over
- Added error when multiple nodes are dropped in scene **without** scene root
  - Removed TTR: "This operation requires a single selected node.", "I see.."
  - Introduces TTR: "Can not instaniate multiple nodes without root."
- Fixes "Can't add_child, already got a parent" error
- Reduced multiple resource loading by casting
- Make sure to not _show_resource_type_selector if only PackedScenes are being dropped
@bfloch bfloch force-pushed the fixes_crash_on_drop_scene_file branch from 669f167 to 9d4afdc Compare January 10, 2018 04:16
@bfloch
Copy link
Contributor Author

bfloch commented Jan 10, 2018

Typo fixed.

@akien-mga akien-mga merged commit 4a25a4e into godotengine:master Jan 10, 2018
@bfloch bfloch deleted the fixes_crash_on_drop_scene_file branch January 10, 2018 07:16
@YuriSizov YuriSizov mentioned this pull request Nov 21, 2023
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 left review comments

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

Successfully merging this pull request may close these issues.
2 participants
@bfloch @akien-mga