From 0d4a40bf5327747b44ad42d810701e0bc3806140 Mon Sep 17 00:00:00 2001
From: Marcel Admiraal <madmiraal@users.noreply.github.com>
Date: Sun, 6 Dec 2020 12:50:24 +0000
Subject: [PATCH] Rename scene/3d/physics_joint_3d to scene/3d/joints_3d

---
 editor/node_3d_editor_gizmos.cpp                 | 2 +-
 editor/plugins/skeleton_3d_editor_plugin.cpp     | 2 +-
 scene/3d/{physics_joint_3d.cpp => joints_3d.cpp} | 4 ++--
 scene/3d/{physics_joint_3d.h => joints_3d.h}     | 8 ++++----
 scene/register_scene_types.cpp                   | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)
 rename scene/3d/{physics_joint_3d.cpp => joints_3d.cpp} (99%)
 rename scene/3d/{physics_joint_3d.h => joints_3d.h} (98%)

diff --git a/editor/node_3d_editor_gizmos.cpp b/editor/node_3d_editor_gizmos.cpp
index afafd7d195c8..1c428b97a85d 100644
--- a/editor/node_3d_editor_gizmos.cpp
+++ b/editor/node_3d_editor_gizmos.cpp
@@ -42,13 +42,13 @@
 #include "scene/3d/gi_probe.h"
 #include "scene/3d/gpu_particles_3d.h"
 #include "scene/3d/gpu_particles_collision_3d.h"
+#include "scene/3d/joints_3d.h"
 #include "scene/3d/light_3d.h"
 #include "scene/3d/lightmap_probe.h"
 #include "scene/3d/listener_3d.h"
 #include "scene/3d/mesh_instance_3d.h"
 #include "scene/3d/navigation_region_3d.h"
 #include "scene/3d/occluder_instance_3d.h"
-#include "scene/3d/physics_joint_3d.h"
 #include "scene/3d/position_3d.h"
 #include "scene/3d/ray_cast_3d.h"
 #include "scene/3d/reflection_probe.h"
diff --git a/editor/plugins/skeleton_3d_editor_plugin.cpp b/editor/plugins/skeleton_3d_editor_plugin.cpp
index 404ef62eca39..9be3c5521227 100644
--- a/editor/plugins/skeleton_3d_editor_plugin.cpp
+++ b/editor/plugins/skeleton_3d_editor_plugin.cpp
@@ -37,9 +37,9 @@
 #include "editor/plugins/animation_player_editor_plugin.h"
 #include "node_3d_editor_plugin.h"
 #include "scene/3d/collision_shape_3d.h"
+#include "scene/3d/joints_3d.h"
 #include "scene/3d/mesh_instance_3d.h"
 #include "scene/3d/physics_body_3d.h"
-#include "scene/3d/physics_joint_3d.h"
 #include "scene/resources/capsule_shape_3d.h"
 #include "scene/resources/sphere_shape_3d.h"
 
diff --git a/scene/3d/physics_joint_3d.cpp b/scene/3d/joints_3d.cpp
similarity index 99%
rename from scene/3d/physics_joint_3d.cpp
rename to scene/3d/joints_3d.cpp
index 3d58d1c10eb0..1ae3fc532b12 100644
--- a/scene/3d/physics_joint_3d.cpp
+++ b/scene/3d/joints_3d.cpp
@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  physics_joint_3d.cpp                                                 */
+/*  joints_3d.cpp                                                        */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "physics_joint_3d.h"
+#include "joints_3d.h"
 
 #include "scene/scene_string_names.h"
 
diff --git a/scene/3d/physics_joint_3d.h b/scene/3d/joints_3d.h
similarity index 98%
rename from scene/3d/physics_joint_3d.h
rename to scene/3d/joints_3d.h
index 3e0ea38a5cb2..350201d5c78a 100644
--- a/scene/3d/physics_joint_3d.h
+++ b/scene/3d/joints_3d.h
@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  physics_joint_3d.h                                                   */
+/*  joints_3d.h                                                          */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef PHYSICS_JOINT_H
-#define PHYSICS_JOINT_H
+#ifndef JOINTS_3D_H
+#define JOINTS_3D_H
 
 #include "scene/3d/node_3d.h"
 #include "scene/3d/physics_body_3d.h"
@@ -334,4 +334,4 @@ class Generic6DOFJoint3D : public Joint3D {
 VARIANT_ENUM_CAST(Generic6DOFJoint3D::Param);
 VARIANT_ENUM_CAST(Generic6DOFJoint3D::Flag);
 
-#endif // PHYSICS_JOINT_H
+#endif // JOINTS_3D_H
diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp
index b16532676fa2..c3fb7ea96a94 100644
--- a/scene/register_scene_types.cpp
+++ b/scene/register_scene_types.cpp
@@ -200,6 +200,7 @@
 #include "scene/3d/gpu_particles_3d.h"
 #include "scene/3d/gpu_particles_collision_3d.h"
 #include "scene/3d/immediate_geometry_3d.h"
+#include "scene/3d/joints_3d.h"
 #include "scene/3d/light_3d.h"
 #include "scene/3d/lightmap_probe.h"
 #include "scene/3d/listener_3d.h"
@@ -211,7 +212,6 @@
 #include "scene/3d/occluder_instance_3d.h"
 #include "scene/3d/path_3d.h"
 #include "scene/3d/physics_body_3d.h"
-#include "scene/3d/physics_joint_3d.h"
 #include "scene/3d/position_3d.h"
 #include "scene/3d/proximity_group_3d.h"
 #include "scene/3d/ray_cast_3d.h"