godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #36276 from Chaosus/fix_texture_base 

Fix GDCLASS for Texture2D/TextureLayered
This commit is contained in:
Rémi Verschelde 2020-02-17 07:29:20 +01:00 committed by GitHub
parent c837dd4408 ed05e27c81
commit 3527f52d69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/classes/Texture2D.xml
View File

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

2
doc/classes/TextureLayered.xml
View File

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

4
scene/resources/texture.h
View File

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