asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1217 from sanikoyes/Pr-canvas-shader-disable-3d

Browse source 
Pr-canvas-shader-disable-3d
This commit is contained in:
Juan Linietsky 2015-01-17 09:44:22 -03:00
commit cce0d50516
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
scene/register_scene_types.cpp
View file

@ -496,17 +496,18 @@ void register_scene_types() {
/* REGISTER RESOURCES */ /* REGISTER RESOURCES */
ObjectTypeDB::register_virtual_type<Shader>();
ObjectTypeDB::register_virtual_type<ShaderGraph>();
ObjectTypeDB::register_type<CanvasItemShader>();
#ifndef _3D_DISABLED #ifndef _3D_DISABLED
ObjectTypeDB::register_type<Mesh>(); ObjectTypeDB::register_type<Mesh>();
ObjectTypeDB::register_virtual_type<Material>(); ObjectTypeDB::register_virtual_type<Material>();
ObjectTypeDB::register_type<FixedMaterial>(); ObjectTypeDB::register_type<FixedMaterial>();
ObjectTypeDB::register_type<ShaderMaterial>(); ObjectTypeDB::register_type<ShaderMaterial>();
ObjectTypeDB::register_type<RoomBounds>(); ObjectTypeDB::register_type<RoomBounds>();
ObjectTypeDB::register_virtual_type<Shader>();
ObjectTypeDB::register_virtual_type<ShaderGraph>();
ObjectTypeDB::register_type<MaterialShaderGraph>(); ObjectTypeDB::register_type<MaterialShaderGraph>();
ObjectTypeDB::register_type<MaterialShader>(); ObjectTypeDB::register_type<MaterialShader>();
ObjectTypeDB::register_type<CanvasItemShader>();
ObjectTypeDB::add_compatibility_type("Shader","MaterialShader"); ObjectTypeDB::add_compatibility_type("Shader","MaterialShader");
ObjectTypeDB::add_compatibility_type("ParticleSystemMaterial","FixedMaterial"); ObjectTypeDB::add_compatibility_type("ParticleSystemMaterial","FixedMaterial");
ObjectTypeDB::add_compatibility_type("UnshadedMaterial","FixedMaterial"); ObjectTypeDB::add_compatibility_type("UnshadedMaterial","FixedMaterial");