diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-02-24 01:29:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-24 01:29:35 +0100 |
| commit | 6b32e96d6e014d73e201834ad3556317cfe22a40 (patch) | |
| tree | 2c07df2c09f13e9ac416a423df1ac1d5b7b39feb /scene/resources | |
| parent | c91ddf721f47db4afac33428f96217ecfdd60cf3 (diff) | |
| parent | b51a86a57a574e115eba927aff23446f3ca6ba7b (diff) | |
Merge pull request #16930 from PJB3005/18-02-22-styleboxtexture-texture
StyleBoxTexture: Texture instead of RES for texture and normal_map.
Diffstat (limited to 'scene/resources')
| -rw-r--r-- | scene/resources/style_box.cpp | 8 | ||||
| -rw-r--r-- | scene/resources/style_box.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/scene/resources/style_box.cpp b/scene/resources/style_box.cpp index f256e0397d..626fda50df 100644 --- a/scene/resources/style_box.cpp +++ b/scene/resources/style_box.cpp @@ -101,7 +101,7 @@ StyleBox::StyleBox() { } } -void StyleBoxTexture::set_texture(RES p_texture) { +void StyleBoxTexture::set_texture(Ref<Texture> p_texture) { if (texture == p_texture) return; @@ -112,12 +112,12 @@ void StyleBoxTexture::set_texture(RES p_texture) { _change_notify("texture"); } -RES StyleBoxTexture::get_texture() const { +Ref<Texture> StyleBoxTexture::get_texture() const { return texture; } -void StyleBoxTexture::set_normal_map(RES p_normal_map) { +void StyleBoxTexture::set_normal_map(Ref<Texture> p_normal_map) { if (normal_map == p_normal_map) return; @@ -125,7 +125,7 @@ void StyleBoxTexture::set_normal_map(RES p_normal_map) { emit_changed(); } -RES StyleBoxTexture::get_normal_map() const { +Ref<Texture> StyleBoxTexture::get_normal_map() const { return normal_map; } diff --git a/scene/resources/style_box.h b/scene/resources/style_box.h index fb79aa360e..c1d84fe19f 100644 --- a/scene/resources/style_box.h +++ b/scene/resources/style_box.h @@ -112,11 +112,11 @@ public: void set_region_rect(const Rect2 &p_region_rect); Rect2 get_region_rect() const; - void set_texture(RES p_texture); - RES get_texture() const; + void set_texture(Ref<Texture> p_texture); + Ref<Texture> get_texture() const; - void set_normal_map(RES p_normal_map); - RES get_normal_map() const; + void set_normal_map(Ref<Texture> p_normal_map); + Ref<Texture> get_normal_map() const; void set_draw_center(bool p_enabled); bool is_draw_center_enabled() const; |