diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-02-09 12:10:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-09 12:10:12 +0100 |
| commit | 6d98ce281fdc86e9be1449deb27ec5ba9a85d19f (patch) | |
| tree | c60835a298065d3e5bfcc221b5f99c0e70170cee | |
| parent | 4fd579b271e1b5274266843b9b19ed60f4c8a9a1 (diff) | |
| parent | 5743c7910a24613966d6b39ed2c1198fb852181d (diff) | |
Merge pull request #25671 from vnen/physics-material-2d
Include PhysicsMaterial when 3D is disabled
| -rw-r--r-- | scene/register_scene_types.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp index a50a09f095..078d880d0e 100644 --- a/scene/register_scene_types.cpp +++ b/scene/register_scene_types.cpp @@ -145,6 +145,7 @@ #include "scene/resources/mesh_library.h" #include "scene/resources/packed_scene.h" #include "scene/resources/particles_material.h" +#include "scene/resources/physics_material.h" #include "scene/resources/plane_shape.h" #include "scene/resources/polygon_path_finder.h" #include "scene/resources/primitive_meshes.h" @@ -207,7 +208,6 @@ #include "scene/3d/visibility_notifier.h" #include "scene/animation/skeleton_ik.h" #include "scene/resources/environment.h" -#include "scene/resources/physics_material.h" #endif static Ref<ResourceFormatSaverText> resource_saver_text; @@ -602,8 +602,8 @@ void register_scene_types() { ClassDB::register_class<SpatialVelocityTracker>(); - ClassDB::register_class<PhysicsMaterial>(); #endif + ClassDB::register_class<PhysicsMaterial>(); ClassDB::register_class<World>(); ClassDB::register_class<Environment>(); ClassDB::register_class<World2D>(); |