asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #26331 from hpvb/fix-26284

Browse source 
Don't crash on previewing an AtlasTexture without a region
This commit is contained in:
Hein-Pieter van Braam 2019-02-27 01:47:55 +01:00 committed by GitHub
commit 9434db47dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
editor/plugins/editor_preview_plugins.cpp
View file

@ -92,7 +92,12 @@ Ref<Texture> EditorTexturePreviewPlugin::generate(const RES &p_from, const Size2
if (!tex.is_valid()) {
return Ref<Texture>();
}
Ref<Image> atlas = tex->get_data();
if (!atlas.is_valid()) {
return Ref<Texture>();
}
img = atlas->get_rect(atex->get_region());
} else if (ltex.is_valid()) {
img = ltex->to_image();

3
scene/resources/texture.cpp
View file

@ -426,6 +426,8 @@ ImageTexture::ImageTexture() {
texture = VisualServer::get_singleton()->texture_create();
storage = STORAGE_RAW;
lossy_storage_quality = 0.7;
image_stored = false;
format = Image::Format::FORMAT_L8;
}
ImageTexture::~ImageTexture() {
@ -1514,6 +1516,7 @@ CubeMap::CubeMap() {
cubemap = VisualServer::get_singleton()->texture_create();
storage = STORAGE_RAW;
lossy_storage_quality = 0.7;
format = Image::Format::FORMAT_BPTC_RGBA;
}
CubeMap::~CubeMap() {