浏览代码

Merge pull request #50777 from KoBeWi/Schrödinger's-Label

Don't set metadata_label font if it doesn't exist
Rémi Verschelde 4 年之前
父节点
当前提交
d17201afc2
共有 2 个文件被更改,包括 7 次插入5 次删除
  1. 4 2
      editor/plugins/texture_editor_plugin.cpp
  2. 3 3
      editor/plugins/texture_editor_plugin.h

+ 4 - 2
editor/plugins/texture_editor_plugin.cpp

@@ -48,8 +48,10 @@ void TexturePreview::_notification(int p_what) {
 				break;
 			}
 
-			Ref<Font> metadata_label_font = get_theme_font(SNAME("expression"), SNAME("EditorFonts"));
-			metadata_label->add_theme_font_override("font", metadata_label_font);
+			if (metadata_label) {
+				Ref<Font> metadata_label_font = get_theme_font(SNAME("expression"), SNAME("EditorFonts"));
+				metadata_label->add_theme_font_override("font", metadata_label_font);
+			}
 
 			checkerboard->set_texture(get_theme_icon(SNAME("Checkerboard"), SNAME("EditorIcons")));
 		} break;

+ 3 - 3
editor/plugins/texture_editor_plugin.h

@@ -39,10 +39,10 @@ class TexturePreview : public MarginContainer {
 	GDCLASS(TexturePreview, MarginContainer);
 
 private:
-	TextureRect *texture_display;
+	TextureRect *texture_display = nullptr;
 
-	TextureRect *checkerboard;
-	Label *metadata_label;
+	TextureRect *checkerboard = nullptr;
+	Label *metadata_label = nullptr;
 
 protected:
 	void _notification(int p_what);