diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-06-15 23:37:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-15 23:37:05 +0200 |
| commit | e606b510aed533638a00180b6c00f2231da15175 (patch) | |
| tree | 0786d88802fac951afbaa5fccf09e6bcc64f2d82 /scene | |
| parent | c5a2a7a66a55fb258ee62f96afc29a7ccaaf8771 (diff) | |
| parent | dc1ca8fbd0d27f6958a81b5ed35a6fb32798751a (diff) | |
Merge pull request #39544 from nathanfranke/canvas-item-parent-node-rename
Change "ParentNode" to "Inherit" in Texture Options
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/main/canvas_item.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/main/canvas_item.cpp b/scene/main/canvas_item.cpp index 524ff346d1..721f573f39 100644 --- a/scene/main/canvas_item.cpp +++ b/scene/main/canvas_item.cpp @@ -1222,8 +1222,8 @@ void CanvasItem::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::INT, "light_mask", PROPERTY_HINT_LAYERS_2D_RENDER), "set_light_mask", "get_light_mask"); ADD_GROUP("Texture", "texture_"); - ADD_PROPERTY(PropertyInfo(Variant::INT, "texture_filter", PROPERTY_HINT_ENUM, "ParentNode,Nearest,Linear,MipmapNearest,MipmapLinear,MipmapNearestAniso,MipmapLinearAniso"), "set_texture_filter", "get_texture_filter"); - ADD_PROPERTY(PropertyInfo(Variant::INT, "texture_repeat", PROPERTY_HINT_ENUM, "ParentNode,Disabled,Enabled,Mirror"), "set_texture_repeat", "get_texture_repeat"); + ADD_PROPERTY(PropertyInfo(Variant::INT, "texture_filter", PROPERTY_HINT_ENUM, "Inherit,Nearest,Linear,MipmapNearest,MipmapLinear,MipmapNearestAniso,MipmapLinearAniso"), "set_texture_filter", "get_texture_filter"); + ADD_PROPERTY(PropertyInfo(Variant::INT, "texture_repeat", PROPERTY_HINT_ENUM, "Inherit,Disabled,Enabled,Mirror"), "set_texture_repeat", "get_texture_repeat"); ADD_GROUP("Material", ""); ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "material", PROPERTY_HINT_RESOURCE_TYPE, "ShaderMaterial,CanvasItemMaterial"), "set_material", "get_material"); |