diff options
| author | Anton Yabchinskiy | 2015-01-14 23:17:15 +0300 |
|---|---|---|
| committer | Anton Yabchinskiy | 2015-01-14 23:17:15 +0300 |
| commit | d6998995b54fd4fed83eef9db3bbb45fa60565db (patch) | |
| tree | 927e4e2441db1c62b3853d03f3ed4bb996881045 /scene/register_scene_types.cpp | |
| parent | b6c5cb1064eab63788060dc918d7fec53e57a532 (diff) | |
| parent | 04af74596d070f062bd917b0364d87c57544f8d5 (diff) | |
| download | godot-d6998995b54fd4fed83eef9db3bbb45fa60565db.tar.gz godot-d6998995b54fd4fed83eef9db3bbb45fa60565db.tar.zst godot-d6998995b54fd4fed83eef9db3bbb45fa60565db.zip | |
Merge branch 'master' of github.com:okamstudio/godot
Conflicts:
platform/x11/detect.py
Diffstat (limited to 'scene/register_scene_types.cpp')
| -rw-r--r-- | scene/register_scene_types.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp index cf4997911..8f28a3116 100644 --- a/scene/register_scene_types.cpp +++ b/scene/register_scene_types.cpp @@ -272,7 +272,7 @@ void register_scene_types() { ObjectTypeDB::register_type<Control>(); // ObjectTypeDB::register_type<EmptyControl>(); - ObjectTypeDB::add_compatibility_type("EmptyControl","control"); + ObjectTypeDB::add_compatibility_type("EmptyControl","Control"); ObjectTypeDB::register_type<Button>(); ObjectTypeDB::register_type<Label>(); ObjectTypeDB::register_type<HScrollBar>(); @@ -500,14 +500,13 @@ void register_scene_types() { ObjectTypeDB::register_type<Mesh>(); ObjectTypeDB::register_virtual_type<Material>(); ObjectTypeDB::register_type<FixedMaterial>(); - //ObjectTypeDB::register_type<ParticleSystemMaterial>(); - //ObjectTypeDB::register_type<UnshadedMaterial>(); 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"); |