godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #40759 from pycbouh/fix-scene-preview-no-2d 

Fix errors saving a 2D scene preview when the 2D editor was never opened
This commit is contained in:
Rémi Verschelde 2020-07-27 16:27:25 +02:00 committed by GitHub
parent 94e6fcd2aa e2b85b74a2
commit 09a2b77b2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
editor/editor_node.cpp
View File

@ -1236,7 +1236,10 @@ void EditorNode::_save_scene_with_preview(String p_file, int p_idx) {
img.instance(); img.instance();
img->create(1, 1, 0, Image::FORMAT_RGB8); img->create(1, 1, 0, Image::FORMAT_RGB8);
} else if (c3d < c2d) { } else if (c3d < c2d) {
img = scene_root->get_texture()->get_data(); Ref<ViewportTexture> viewport_texture = scene_root->get_texture();
if (viewport_texture->get_width() > 0 && viewport_texture->get_height() > 0) {
img = viewport_texture->get_data();
}
} else { } else {
// The 3D editor may be disabled as a feature, but scenes can still be opened. // The 3D editor may be disabled as a feature, but scenes can still be opened.
// This check prevents the preview from regenerating in case those scenes are then saved. // This check prevents the preview from regenerating in case those scenes are then saved.
@ -1246,7 +1249,7 @@ void EditorNode::_save_scene_with_preview(String p_file, int p_idx) {
} }
} }
if (img.is_valid()) { if (img.is_valid() && img->get_width() > 0 && img->get_height() > 0) {
img = img->duplicate(); img = img->duplicate();
save.step(TTR("Creating Thumbnail"), 2); save.step(TTR("Creating Thumbnail"), 2);