Skip to content

Commit 6075e6a

Browse files
committed
Merge pull request godotengine#104957 from arkology/empty-bitmap-crash
Fix `BitMapEditor` crash when bitmap is empty
2 parents d0b3e0b + d8fca99 commit 6075e6a

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

editor/plugins/bit_map_editor_plugin.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,11 @@
4141
void BitMapEditor::setup(const Ref<BitMap> &p_bitmap) {
4242
Ref<ImageTexture> bitmap_texture = ImageTexture::create_from_image(p_bitmap->convert_to_image());
4343
texture_rect->set_texture(bitmap_texture);
44-
centering_container->set_ratio(bitmap_texture->get_size().aspect());
44+
if (bitmap_texture.is_valid()) {
45+
centering_container->set_custom_minimum_size(Size2(0, 250) * EDSCALE);
46+
centering_container->set_ratio(bitmap_texture->get_size().aspect());
47+
outline_overlay->connect(SceneStringName(draw), callable_mp(this, &BitMapEditor::_draw_outline));
48+
}
4549
size_label->set_text(vformat(U"%s×%s", p_bitmap->get_size().width, p_bitmap->get_size().height));
4650
}
4751

@@ -70,7 +74,6 @@ BitMapEditor::BitMapEditor() {
7074
add_child(margin_container);
7175

7276
centering_container = memnew(AspectRatioContainer);
73-
centering_container->set_custom_minimum_size(Size2(0, 250) * EDSCALE);
7477
margin_container->add_child(centering_container);
7578

7679
texture_rect = memnew(TextureRect);
@@ -79,7 +82,6 @@ BitMapEditor::BitMapEditor() {
7982
centering_container->add_child(texture_rect);
8083

8184
outline_overlay = memnew(Control);
82-
outline_overlay->connect(SceneStringName(draw), callable_mp(this, &BitMapEditor::_draw_outline));
8385
centering_container->add_child(outline_overlay);
8486

8587
size_label = memnew(Label);

0 commit comments

Comments
 (0)