diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-06-30 18:47:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-30 18:47:40 +0200 |
| commit | a02620f3a5f3b94c68dfbe18874b34ac1c32374a (patch) | |
| tree | 6e203152459a2efff38db6a18490f38f9efc88bf /core | |
| parent | 6f9767eff75c1e1db635139588994ad7ce1763b8 (diff) | |
| parent | 75688772b3efadb8a36b1bb7ccde9c08819bc58e (diff) | |
Merge pull request #50009 from reduz/fix-suffixes-and-degrees
Fix editor suffixes and degrees conversion
Diffstat (limited to 'core')
| -rw-r--r-- | core/core_constants.cpp | 1 | ||||
| -rw-r--r-- | core/object/object.h | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/core/core_constants.cpp b/core/core_constants.cpp index 9f5f8f733f..0aad21276a 100644 --- a/core/core_constants.cpp +++ b/core/core_constants.cpp @@ -508,7 +508,6 @@ void register_global_constants() { BIND_CORE_ENUM_CONSTANT(PROPERTY_HINT_NONE); BIND_CORE_ENUM_CONSTANT(PROPERTY_HINT_RANGE); - BIND_CORE_ENUM_CONSTANT(PROPERTY_HINT_EXP_RANGE); BIND_CORE_ENUM_CONSTANT(PROPERTY_HINT_ENUM); BIND_CORE_ENUM_CONSTANT(PROPERTY_HINT_EXP_EASING); BIND_CORE_ENUM_CONSTANT(PROPERTY_HINT_LENGTH); diff --git a/core/object/object.h b/core/object/object.h index 461ed482fe..632db41591 100644 --- a/core/object/object.h +++ b/core/object/object.h @@ -58,8 +58,7 @@ enum PropertyHint { PROPERTY_HINT_NONE, ///< no hint provided. - PROPERTY_HINT_RANGE, ///< hint_text = "min,max,step,slider; //slider is optional" - PROPERTY_HINT_EXP_RANGE, ///< hint_text = "min,max,step", exponential edit + PROPERTY_HINT_RANGE, ///< hint_text = "min,max[,step][,or_greater][,or_lesser][,noslider][,radians][,degrees][,exp][,suffix:<keyword>] range. PROPERTY_HINT_ENUM, ///< hint_text= "val1,val2,val3,etc" PROPERTY_HINT_EXP_EASING, /// exponential easing function (Math::ease) use "attenuation" hint string to revert (flip h), "full" to also include in/out. (ie: "attenuation,inout") PROPERTY_HINT_LENGTH, ///< hint_text= "length" (as integer) |