Merge pull request #57613 from timothyqiu/viewport-preview

[3.x] Revert "Fix ViewportPreview upside-down in 3.x."
This commit is contained in:
Rémi Verschelde 2022-02-04 08:17:41 +01:00 committed by GitHub
commit 7ca4eb478e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -38,8 +38,6 @@ void EditorInspectorPluginViewportPreview::parse_begin(Object *p_object) {
Viewport *viewport = Object::cast_to<Viewport>(p_object); Viewport *viewport = Object::cast_to<Viewport>(p_object);
TexturePreview *viewport_preview = memnew(TexturePreview(viewport->get_texture(), false)); TexturePreview *viewport_preview = memnew(TexturePreview(viewport->get_texture(), false));
viewport_preview->get_texture_display()->set_flip_v(true); // flip as ViewportTexture in 3.x is upside-down.
// Otherwise `viewport_preview`'s `texture_display` doesn't update properly when `viewport`'s size changes. // Otherwise `viewport_preview`'s `texture_display` doesn't update properly when `viewport`'s size changes.
viewport->connect("size_changed", viewport_preview->get_texture_display(), "update"); viewport->connect("size_changed", viewport_preview->get_texture_display(), "update");
add_custom_control(viewport_preview); add_custom_control(viewport_preview);