summaryrefslogtreecommitdiff
path: root/doc/classes
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2018-02-24 01:29:35 +0100
committerGitHub <noreply@github.com>2018-02-24 01:29:35 +0100
commit6b32e96d6e014d73e201834ad3556317cfe22a40 (patch)
tree2c07df2c09f13e9ac416a423df1ac1d5b7b39feb /doc/classes
parentc91ddf721f47db4afac33428f96217ecfdd60cf3 (diff)
parentb51a86a57a574e115eba927aff23446f3ca6ba7b (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 'doc/classes')
-rw-r--r--doc/classes/StyleBoxTexture.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/classes/StyleBoxTexture.xml b/doc/classes/StyleBoxTexture.xml
index 6245400943..f789252e1d 100644
--- a/doc/classes/StyleBoxTexture.xml
+++ b/doc/classes/StyleBoxTexture.xml
@@ -59,11 +59,11 @@
</member>
<member name="modulate_color" type="Color" setter="set_modulate" getter="get_modulate">
</member>
- <member name="normal_map" type="Resource" setter="set_normal_map" getter="get_normal_map">
+ <member name="normal_map" type="Texture" setter="set_normal_map" getter="get_normal_map">
</member>
<member name="region_rect" type="Rect2" setter="set_region_rect" getter="get_region_rect">
</member>
- <member name="texture" type="Resource" setter="set_texture" getter="get_texture">
+ <member name="texture" type="Texture" setter="set_texture" getter="get_texture">
</member>
</members>
<signals>