diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-08-14 09:36:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-14 09:36:16 +0200 |
| commit | 59879447a395adc4ced2ee7e88b0ef1bcc32c82d (patch) | |
| tree | a17c5dc4fddebd4379d57c3de0ba88a01638b87d /scene/register_scene_types.cpp | |
| parent | f32c042f3e14a2de2f2d416ff35b0a3c80785e33 (diff) | |
| parent | 8e3f71d75060c70745f541d5cab509f7bea690df (diff) | |
| download | redot-engine-59879447a395adc4ced2ee7e88b0ef1bcc32c82d.tar.gz | |
Merge pull request #51636 from Calinou/rename-lineshape2d
Rename LineShape2D to WorldMarginShape2D
Diffstat (limited to 'scene/register_scene_types.cpp')
| -rw-r--r-- | scene/register_scene_types.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp index 0c83c57de6..47c7e57e3f 100644 --- a/scene/register_scene_types.cpp +++ b/scene/register_scene_types.cpp @@ -148,7 +148,6 @@ #include "scene/resources/gradient.h" #include "scene/resources/height_map_shape_3d.h" #include "scene/resources/immediate_mesh.h" -#include "scene/resources/line_shape_2d.h" #include "scene/resources/material.h" #include "scene/resources/mesh.h" #include "scene/resources/mesh_data_tool.h" @@ -187,6 +186,7 @@ #include "scene/resources/visual_shader_sdf_nodes.h" #include "scene/resources/world_2d.h" #include "scene/resources/world_3d.h" +#include "scene/resources/world_margin_shape_2d.h" #include "scene/resources/world_margin_shape_3d.h" #include "scene/scene_string_names.h" @@ -823,7 +823,7 @@ void register_scene_types() { OS::get_singleton()->yield(); //may take time to init GDREGISTER_VIRTUAL_CLASS(Shape2D); - GDREGISTER_CLASS(LineShape2D); + GDREGISTER_CLASS(WorldMarginShape2D); GDREGISTER_CLASS(SegmentShape2D); GDREGISTER_CLASS(CircleShape2D); GDREGISTER_CLASS(RectangleShape2D); @@ -910,6 +910,7 @@ void register_scene_types() { ClassDB::add_compatibility_class("KinematicBody2D", "CharacterBody2D"); ClassDB::add_compatibility_class("KinematicCollision", "KinematicCollision3D"); ClassDB::add_compatibility_class("Light", "Light3D"); + ClassDB::add_compatibility_class("LineShape2D", "WorldMarginShape2D"); ClassDB::add_compatibility_class("Listener", "Listener3D"); ClassDB::add_compatibility_class("MeshInstance", "MeshInstance3D"); ClassDB::add_compatibility_class("MultiMeshInstance", "MultiMeshInstance3D"); |