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

Merge pull request #40163 from pycbouh/fix-saving-empty-scene 

Improve scene preview generation for empty scenes and disabled features
This commit is contained in:
Rémi Verschelde 2020-07-06 22:52:49 +02:00 committed by GitHub
parent b5a73c9e5c 6c8a9b7690
commit b00e8ffb22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
editor/editor_node.cpp
View File

@ -1225,20 +1225,25 @@ void EditorNode::_save_scene_with_preview(String p_file, int p_idx) {
_find_node_types(editor_data.get_edited_scene_root(), c2d, c3d);
bool is2d;
if (c3d < c2d) {
is2d = true;
} else {
is2d = false;
}
save.step(TTR("Creating Thumbnail"), 1);
//current view?
Ref<Image> img;
if (is2d) {
// If neither 3D or 2D nodes are present, make a 1x1 black texture.
// We cannot fallback on the 2D editor, because it may not have been used yet,
// which would result in an invalid texture.
if (c3d == 0 && c2d == 0) {
img.instance();
img->create(1, 1, 0, Image::FORMAT_RGB8);
} else if (c3d < c2d) {
img = scene_root->get_texture()->get_data();
} else {
img = Node3DEditor::get_singleton()->get_editor_viewport(0)->get_viewport_node()->get_texture()->get_data();
// 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.
Ref<EditorFeatureProfile> profile = feature_profile_manager->get_current_profile();
if (!profile->is_feature_disabled(EditorFeatureProfile::FEATURE_3D)) {
img = Node3DEditor::get_singleton()->get_editor_viewport(0)->get_viewport_node()->get_texture()->get_data();
}
}
if (img.is_valid()) {