aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsanikoyes2015-01-14 14:49:54 +0800
committersanikoyes2015-01-14 14:49:54 +0800
commitb8828361849b32674c4048a1b74e109b09db97eb (patch)
treeaec6eccef9007f44c3f9f5cae37dfc1721ca35e2
parent9012cd408e240d6039120e56fdd47a0983890993 (diff)
downloadgodot-b8828361849b32674c4048a1b74e109b09db97eb.tar.gz
godot-b8828361849b32674c4048a1b74e109b09db97eb.tar.zst
godot-b8828361849b32674c4048a1b74e109b09db97eb.zip
Fix canvas shader not registered when disabled_3d=yes
-rw-r--r--scene/register_scene_types.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp
index 8f28a3116..998e0b204 100644
--- a/scene/register_scene_types.cpp
+++ b/scene/register_scene_types.cpp
@@ -496,17 +496,18 @@ void register_scene_types() {
/* REGISTER RESOURCES */
+ ObjectTypeDB::register_virtual_type<Shader>();
+ ObjectTypeDB::register_virtual_type<ShaderGraph>();
+ ObjectTypeDB::register_type<CanvasItemShader>();
+
#ifndef _3D_DISABLED
ObjectTypeDB::register_type<Mesh>();
ObjectTypeDB::register_virtual_type<Material>();
ObjectTypeDB::register_type<FixedMaterial>();
ObjectTypeDB::register_type<ShaderMaterial>();
ObjectTypeDB::register_type<RoomBounds>();
- ObjectTypeDB::register_virtual_type<Shader>();
- ObjectTypeDB::register_virtual_type<ShaderGraph>();
ObjectTypeDB::register_type<MaterialShaderGraph>();
ObjectTypeDB::register_type<MaterialShader>();
- ObjectTypeDB::register_type<CanvasItemShader>();
ObjectTypeDB::add_compatibility_type("Shader","MaterialShader");
ObjectTypeDB::add_compatibility_type("ParticleSystemMaterial","FixedMaterial");
ObjectTypeDB::add_compatibility_type("UnshadedMaterial","FixedMaterial");