Merge branch 'Tryibion-fix-joint-flag-cat'
This commit is contained in:
@@ -52,7 +52,7 @@ public:
|
||||
/// <summary>
|
||||
/// Gets the joint mode flags. Controls joint behaviour.
|
||||
/// </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
|
||||
{
|
||||
return _flags;
|
||||
|
||||
@@ -80,7 +80,7 @@ public:
|
||||
/// <summary>
|
||||
/// Gets the joint mode flags. Controls joint behaviour.
|
||||
/// </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
|
||||
{
|
||||
return _flags;
|
||||
|
||||
Reference in New Issue
Block a user