diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-01-17 09:44:22 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-01-17 09:44:22 -0300 |
| commit | cce0d505168ce01b98f952678ad93787c0df229a (patch) | |
| tree | 68bd2238ef99db1cc214120c9154c9d96107c0b6 | |
| parent | 8df47f59d5737b2eeeb46550f61b0245e5a75bba (diff) | |
| parent | b8828361849b32674c4048a1b74e109b09db97eb (diff) | |
Merge pull request #1217 from sanikoyes/Pr-canvas-shader-disable-3d
Pr-canvas-shader-disable-3d
| -rw-r--r-- | scene/register_scene_types.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp index 8f28a3116e..998e0b2044 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"); |