diff options
| author | volzhs <volzhs@gmail.com> | 2015-06-28 22:28:02 +0900 |
|---|---|---|
| committer | volzhs <volzhs@gmail.com> | 2015-06-28 22:28:02 +0900 |
| commit | 584dd4db878d0a9ebf44dc529dad35bf8dd4796b (patch) | |
| tree | c601222ba20cacc80fba7ff43b5de425db13519c /scene/resources/texture.cpp | |
| parent | 81a1f32f0c1e4f64bb102c6aa46bcbb4e18bcd55 (diff) | |
| parent | 2b64f73b0459190d20b2f6de39275ee7979317c4 (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'scene/resources/texture.cpp')
| -rw-r--r-- | scene/resources/texture.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scene/resources/texture.cpp b/scene/resources/texture.cpp index 018af0e5db..7b261f7791 100644 --- a/scene/resources/texture.cpp +++ b/scene/resources/texture.cpp @@ -81,6 +81,7 @@ void Texture::_bind_methods() { BIND_CONSTANT( FLAGS_DEFAULT ); BIND_CONSTANT( FLAG_ANISOTROPIC_FILTER ); BIND_CONSTANT( FLAG_CONVERT_TO_LINEAR ); + BIND_CONSTANT( FLAG_MIRRORED_REPEAT ); } @@ -181,7 +182,7 @@ void ImageTexture::_get_property_list( List<PropertyInfo> *p_list) const { - p_list->push_back( PropertyInfo( Variant::INT, "flags", PROPERTY_HINT_FLAGS,"Mipmaps,Repeat,Filter,Anisotropic,sRGB") ); + p_list->push_back( PropertyInfo( Variant::INT, "flags", PROPERTY_HINT_FLAGS,"Mipmaps,Repeat,Filter,Anisotropic,sRGB,Mirrored Repeat") ); p_list->push_back( PropertyInfo( Variant::IMAGE, "image", img_hint,String::num(lossy_storage_quality)) ); p_list->push_back( PropertyInfo( Variant::VECTOR2, "size",PROPERTY_HINT_NONE, "")); p_list->push_back( PropertyInfo( Variant::INT, "storage", PROPERTY_HINT_ENUM,"Uncompressed,Compress Lossy,Compress Lossless")); |