diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-09-14 09:12:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-14 09:12:40 +0200 |
| commit | d05fe056802f15ae533cbe64fc81002b1428df4c (patch) | |
| tree | 1ce662cbad7a6d8a2edda03dbc609ac70323877a /scene/resources/texture.cpp | |
| parent | a6c02c2320a5eb754ae3f056bec68ac13d2adbc5 (diff) | |
| parent | cd0b82fd56bdba5a4f1a057fd2d50854c1f503ef (diff) | |
| download | redot-engine-d05fe056802f15ae533cbe64fc81002b1428df4c.tar.gz | |
Merge pull request #22053 from akien-mga/animtexture-frame-internal
Mark AnimatedTexture frame_* properties as internal
Diffstat (limited to 'scene/resources/texture.cpp')
| -rw-r--r-- | scene/resources/texture.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scene/resources/texture.cpp b/scene/resources/texture.cpp index 9875c7b130..4fa20e7ad0 100644 --- a/scene/resources/texture.cpp +++ b/scene/resources/texture.cpp @@ -30,11 +30,11 @@ #include "texture.h" -#include "bit_mask.h" #include "core/core_string_names.h" #include "core/io/image_loader.h" #include "core/method_bind_ext.gen.inc" #include "core/os/os.h" +#include "scene/resources/bit_mask.h" Size2 Texture::get_size() const { @@ -1945,8 +1945,8 @@ void AnimatedTexture::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::REAL, "fps", PROPERTY_HINT_RANGE, "0,1024,0.1"), "set_fps", "get_fps"); for (int i = 0; i < MAX_FRAMES; i++) { - ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "frame_" + itos(i) + "/texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture"), "set_frame_texture", "get_frame_texture", i); - ADD_PROPERTYI(PropertyInfo(Variant::REAL, "frame_" + itos(i) + "/delay_sec", PROPERTY_HINT_RANGE, "0.0,16.0,0.01"), "set_frame_delay", "get_frame_delay", i); + ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "frame_" + itos(i) + "/texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture", PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL), "set_frame_texture", "get_frame_texture", i); + ADD_PROPERTYI(PropertyInfo(Variant::REAL, "frame_" + itos(i) + "/delay_sec", PROPERTY_HINT_RANGE, "0.0,16.0,0.01", PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL), "set_frame_delay", "get_frame_delay", i); } } |