From d7792feabad6c20aa7bc25dbdeab5cf62f784236 Mon Sep 17 00:00:00 2001
From: Adelynne Brito <abgithub@concerto.gay>
Date: Fri, 5 Dec 2025 17:32:15 -0500
Subject: [PATCH] Move initialization check for CanvasMaterial

Prevents the check from causing other materials to error
---
 editor/scene/material_editor_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/editor/scene/material_editor_plugin.cpp b/editor/scene/material_editor_plugin.cpp
index 200ec8c85f3..a5554ebe295 100644
--- a/editor/scene/material_editor_plugin.cpp
+++ b/editor/scene/material_editor_plugin.cpp
@@ -52,7 +52,6 @@
 
 Ref<ShaderMaterial> MaterialEditor::make_shader_material(const Ref<Material> &p_from, bool p_copy_params) {
 	ERR_FAIL_COND_V(p_from.is_null(), Ref<ShaderMaterial>());
-	ERR_FAIL_COND_V(!p_from->_is_initialized(), Ref<ShaderMaterial>());
 
 	Ref<ShaderMaterial> smat;
 	smat.instantiate();
@@ -497,5 +496,6 @@ bool CanvasItemMaterialConversionPlugin::handles(const Ref<Resource> &p_resource
 }
 
 Ref<Resource> CanvasItemMaterialConversionPlugin::convert(const Ref<Resource> &p_resource) const {
+	ERR_FAIL_COND_V(!Object::cast_to<CanvasItemMaterial>(*p_resource) || !Object::cast_to<CanvasItemMaterial>(*p_resource)->_is_initialized(), Ref<CanvasItemMaterial>());
 	return MaterialEditor::make_shader_material(p_resource);
 }