diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2020-02-17 07:29:20 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-17 07:29:20 +0100 |
commit | 3527f52d6949f5acb8254b501c2847ebabf6de7c (patch) | |
tree | e98363ac544e2bcc4d5e2ff2427da2ab93b01c26 | |
parent | c837dd440897d85c3894fc16c8df9d73325e1c06 (diff) | |
parent | ed05e27c81236447cab4c80833d0dfc0fab5ac85 (diff) |
Merge pull request #36276 from Chaosus/fix_texture_base
Fix GDCLASS for Texture2D/TextureLayered
-rw-r--r-- | doc/classes/Texture2D.xml | 2 | ||||
-rw-r--r-- | doc/classes/TextureLayered.xml | 2 | ||||
-rw-r--r-- | scene/resources/texture.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/doc/classes/Texture2D.xml b/doc/classes/Texture2D.xml index 2ccb469eb1..63cdb0d90a 100644 --- a/doc/classes/Texture2D.xml +++ b/doc/classes/Texture2D.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<class name="Texture2D" inherits="Resource" version="4.0"> +<class name="Texture2D" inherits="Texture" version="4.0"> <brief_description> Texture for 2D and 3D. </brief_description> diff --git a/doc/classes/TextureLayered.xml b/doc/classes/TextureLayered.xml index f9ecdb02f0..66e5b69ab4 100644 --- a/doc/classes/TextureLayered.xml +++ b/doc/classes/TextureLayered.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<class name="TextureLayered" inherits="Resource" version="4.0"> +<class name="TextureLayered" inherits="Texture" version="4.0"> <brief_description> Base class for 3D texture types. </brief_description> diff --git a/scene/resources/texture.h b/scene/resources/texture.h index b42b770903..cd8576539b 100644 --- a/scene/resources/texture.h +++ b/scene/resources/texture.h @@ -52,7 +52,7 @@ public: class Texture2D : public Texture { - GDCLASS(Texture2D, Resource); + GDCLASS(Texture2D, Texture); OBJ_SAVE_TYPE(Texture2D); // Saves derived classes with common type so they can be interchanged. protected: @@ -350,7 +350,7 @@ public: class TextureLayered : public Texture { - GDCLASS(TextureLayered, Resource); + GDCLASS(TextureLayered, Texture); VS::TextureLayeredType layered_type; |