GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix-joint-flag-cat' of https://github.com/Tryibion/FlaxEngine into Tryibion-fix-joint-flag-cat

Browse Source
This commit is contained in:
Wojtek Figat
2024-10-03 11:46:50 +02:00
parent e2462c8151 c3162ca2cb
commit cd964666e2
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Engine/Physics/Joints/DistanceJoint.h
View File

@@ -52,7 +52,7 @@ public:
/// <summary> /// <summary>
/// Gets the joint mode flags. Controls joint behaviour. /// Gets the joint mode flags. Controls joint behaviour.
/// </summary> /// </summary>
API_PROPERTY(Attributes="EditorOrder(100), DefaultValue(DistanceJointFlag.MinDistance | DistanceJointFlag.MaxDistance)") API_PROPERTY(Attributes="EditorOrder(100), EditorDisplay(\"Joint\"), DefaultValue(DistanceJointFlag.MinDistance | DistanceJointFlag.MaxDistance)")
FORCE_INLINE DistanceJointFlag GetFlags() const FORCE_INLINE DistanceJointFlag GetFlags() const
{ {
return _flags; return _flags;

2
Source/Engine/Physics/Joints/HingeJoint.h
View File

@@ -80,7 +80,7 @@ public:
/// <summary> /// <summary>
/// Gets the joint mode flags. Controls joint behaviour. /// Gets the joint mode flags. Controls joint behaviour.
/// </summary> /// </summary>
API_PROPERTY(Attributes="EditorOrder(100), DefaultValue(HingeJointFlag.Limit | HingeJointFlag.Drive)") API_PROPERTY(Attributes="EditorOrder(100), EditorDisplay(\"Joint\"), DefaultValue(HingeJointFlag.Limit | HingeJointFlag.Drive)")
FORCE_INLINE HingeJointFlag GetFlags() const FORCE_INLINE HingeJointFlag GetFlags() const
{ {
return _flags; return _flags;