diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-05-11 13:45:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-11 13:45:48 +0200 |
| commit | 32133a11b56761df99579ad96ee29a47d2aed6b4 (patch) | |
| tree | ab68992cfe6b1f59a618f713545fdcb3b6488b07 /editor/plugins/texture_editor_plugin.cpp | |
| parent | bbdfc7353c3af72fcdf037ff10b8571aa2afc230 (diff) | |
| parent | 1bea8e1eacc68bcedbd3f207395bccf11011dae2 (diff) | |
| download | redot-engine-32133a11b56761df99579ad96ee29a47d2aed6b4.tar.gz | |
Merge pull request #38386 from reduz/new-lightmapper
New GPU lightmapper
Diffstat (limited to 'editor/plugins/texture_editor_plugin.cpp')
| -rw-r--r-- | editor/plugins/texture_editor_plugin.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/editor/plugins/texture_editor_plugin.cpp b/editor/plugins/texture_editor_plugin.cpp index c1184c1c89..7a3e571f16 100644 --- a/editor/plugins/texture_editor_plugin.cpp +++ b/editor/plugins/texture_editor_plugin.cpp @@ -84,8 +84,8 @@ void TextureEditor::_notification(int p_what) { String format; if (Object::cast_to<ImageTexture>(*texture)) { format = Image::get_format_name(Object::cast_to<ImageTexture>(*texture)->get_format()); - } else if (Object::cast_to<StreamTexture>(*texture)) { - format = Image::get_format_name(Object::cast_to<StreamTexture>(*texture)->get_format()); + } else if (Object::cast_to<StreamTexture2D>(*texture)) { + format = Image::get_format_name(Object::cast_to<StreamTexture2D>(*texture)->get_format()); } else { format = texture->get_class(); } @@ -144,7 +144,7 @@ TextureEditor::~TextureEditor() { // bool EditorInspectorPluginTexture::can_handle(Object *p_object) { - return Object::cast_to<ImageTexture>(p_object) != nullptr || Object::cast_to<AtlasTexture>(p_object) != nullptr || Object::cast_to<StreamTexture>(p_object) != nullptr || Object::cast_to<LargeTexture>(p_object) != nullptr || Object::cast_to<AnimatedTexture>(p_object) != nullptr; + return Object::cast_to<ImageTexture>(p_object) != nullptr || Object::cast_to<AtlasTexture>(p_object) != nullptr || Object::cast_to<StreamTexture2D>(p_object) != nullptr || Object::cast_to<LargeTexture>(p_object) != nullptr || Object::cast_to<AnimatedTexture>(p_object) != nullptr; } void EditorInspectorPluginTexture::parse_begin(Object *p_object) { |