diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-07-25 10:33:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-25 10:33:18 +0200 |
| commit | ffca740185d5e34dbb41af825aeb4d04407894e1 (patch) | |
| tree | 1558b190a73f05e39b4ee8c1d5b55fe59fb3444f /modules/gdnative/include/nativescript/godot_nativescript.h | |
| parent | 5a5322ca0625edda3a62c78e51b7ef9e2697f2fe (diff) | |
| parent | 336846e547c1daeb8855b091d21df3b91c2a80a8 (diff) | |
Merge pull request #30806 from akien-mga/fix-hint-sprite-frames
Inspector: Fix PROPERTY_HINT_SPRITE_FRAME not behaving as RANGE
Diffstat (limited to 'modules/gdnative/include/nativescript/godot_nativescript.h')
| -rw-r--r-- | modules/gdnative/include/nativescript/godot_nativescript.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/gdnative/include/nativescript/godot_nativescript.h b/modules/gdnative/include/nativescript/godot_nativescript.h index f3b9f7fb31..7f52f5736c 100644 --- a/modules/gdnative/include/nativescript/godot_nativescript.h +++ b/modules/gdnative/include/nativescript/godot_nativescript.h @@ -56,7 +56,7 @@ typedef enum { GODOT_PROPERTY_HINT_ENUM, ///< hint_text= "val1,val2,val3,etc" GODOT_PROPERTY_HINT_EXP_EASING, /// exponential easing function (Math::ease) GODOT_PROPERTY_HINT_LENGTH, ///< hint_text= "length" (as integer) - GODOT_PROPERTY_HINT_SPRITE_FRAME, + GODOT_PROPERTY_HINT_SPRITE_FRAME, // FIXME: Obsolete: drop whenever we can break compat GODOT_PROPERTY_HINT_KEY_ACCEL, ///< hint_text= "length" (as integer) GODOT_PROPERTY_HINT_FLAGS, ///< hint_text= "flag1,flag2,etc" (as bit flags) GODOT_PROPERTY_HINT_LAYERS_2D_RENDER, @@ -98,8 +98,8 @@ typedef enum { GODOT_PROPERTY_USAGE_INTERNATIONALIZED = 64, //hint for internationalized strings GODOT_PROPERTY_USAGE_GROUP = 128, //used for grouping props in the editor GODOT_PROPERTY_USAGE_CATEGORY = 256, - GODOT_PROPERTY_USAGE_STORE_IF_NONZERO = 512, //only store if nonzero - GODOT_PROPERTY_USAGE_STORE_IF_NONONE = 1024, //only store if false + GODOT_PROPERTY_USAGE_STORE_IF_NONZERO = 512, // FIXME: Obsolete: drop whenever we can break compat + GODOT_PROPERTY_USAGE_STORE_IF_NONONE = 1024, // FIXME: Obsolete: drop whenever we can break compat GODOT_PROPERTY_USAGE_NO_INSTANCE_STATE = 2048, GODOT_PROPERTY_USAGE_RESTART_IF_CHANGED = 4096, GODOT_PROPERTY_USAGE_SCRIPT_VARIABLE = 8192, |