Merge branch 'master' of https://github.com/olive-editor/olive

2021-07-24 09:37:17 -07:00
parent db29dfdf1a 3f785f30fd
commit e433d7c374
29 changed files with 426 additions and 115 deletions
@@ -390,7 +390,7 @@ void ViewerDisplayWidget::OnPaint()
        texture_to_draw = deinterlace_texture_;
      }

-      renderer()->BlitColorManaged(color_service(), texture_to_draw, true, device_params, false,
+      renderer()->BlitColorManaged(color_service(), texture_to_draw, Renderer::kAlphaNone, device_params, false,
                                   combined_matrix_flipped_, crop_matrix_);
    }
  }