godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-22 15:06:45 +00:00
Code Releases Wiki Activity

StyleBoxTexture: Texture instead of RES for texture and normal_map.

Browse Source
This commit is contained in:
Pieter-Jan Briers
2018-02-22 19:27:35 +01:00
parent edd07270c2
commit b51a86a57a
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scene/resources/style_box.cpp
View File

@@ -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;
}

8
scene/resources/style_box.h
View File

@@ -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;