godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Merge pull request #113650 from AdelynneBrito/panorama 

Move initialization check for CanvasMaterial
This commit is contained in:
Rémi Verschelde 2025-12-09 17:17:03 +01:00
parent 40c5b2110e d7792feaba
commit a2d0545cef
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/scene/material_editor_plugin.cpp
View File

@ -52,7 +52,6 @@
Ref<ShaderMaterial> MaterialEditor::make_shader_material(const Ref<Material> &p_from, bool p_copy_params) { 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_null(), Ref<ShaderMaterial>());
ERR_FAIL_COND_V(!p_from->_is_initialized(), Ref<ShaderMaterial>());
Ref<ShaderMaterial> smat; Ref<ShaderMaterial> smat;
smat.instantiate(); smat.instantiate();
@ -497,5 +496,6 @@ bool CanvasItemMaterialConversionPlugin::handles(const Ref<Resource> &p_resource
} }
Ref<Resource> CanvasItemMaterialConversionPlugin::convert(const Ref<Resource> &p_resource) const { 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); return MaterialEditor::make_shader_material(p_resource);
} }