From eff5d0899d5eab96712650b922a80485d89c54ac Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Perrier <jeanbapt.perrier@gmail.com>
Date: Thu, 8 Apr 2021 20:35:01 +0200
Subject: [PATCH] Order + Attributes + Return _up.

---
 .../Engine/Physics/Colliders/CharacterController.cpp  |  2 +-
 Source/Engine/Physics/Colliders/CharacterController.h | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Source/Engine/Physics/Colliders/CharacterController.cpp b/Source/Engine/Physics/Colliders/CharacterController.cpp
index 951f79d37..419b6b052 100644
--- a/Source/Engine/Physics/Colliders/CharacterController.cpp
+++ b/Source/Engine/Physics/Colliders/CharacterController.cpp
@@ -92,7 +92,7 @@ void CharacterController::SetUpDirection(const Vector3& up)
 
 Vector3 CharacterController::GetUpDirection() const
 {
-    return _controller ? P2C(_controller->getUpDirection()) : Vector3::Up;
+    return _controller ? P2C(_controller->getUpDirection()) : _upDirection;
 }
 
 void CharacterController::SetMinMoveDistance(float value)
diff --git a/Source/Engine/Physics/Colliders/CharacterController.h b/Source/Engine/Physics/Colliders/CharacterController.h
index 712ab6296..8ae992c59 100644
--- a/Source/Engine/Physics/Colliders/CharacterController.h
+++ b/Source/Engine/Physics/Colliders/CharacterController.h
@@ -142,15 +142,16 @@ public:
     /// </summary>
     API_PROPERTY() void SetStepOffset(float value);
 
+    /// <summary>
+    /// Gets the character up vector.
+    /// </summary>
+    API_PROPERTY(Attributes="EditorOrder(240), DefaultValue(true), EditorDisplay(\"Character Controller\")")
+    Vector3 GetUpDirection() const;
+    
     /// <summary>
     /// Sets the character up vector.
     /// </summary>
     API_PROPERTY() void SetUpDirection(const Vector3& up);
-
-    /// <summary>
-    /// Gets the character up vector.
-    /// </summary>
-    API_PROPERTY() Vector3 GetUpDirection() const;
     
     /// <summary>
     /// Gets the minimum move distance of the character controller. The minimum traveled distance to consider. If traveled distance is smaller, the character doesn't move. This is used to stop the recursive motion algorithm when remaining distance to travel is small.