From 5d04838af782e02954b28e9573a1f80769919441 Mon Sep 17 00:00:00 2001 From: Good Guy Date: Mon, 3 Apr 2017 18:18:31 -0600 Subject: [PATCH] background render fix, bluebanana keyframe alpha fix --- cinelerra-5.1/cinelerra/file.C | 4 ++-- cinelerra-5.1/cinelerra/mwindow.C | 1 + cinelerra-5.1/plugins/bluebanana/bluebananaconfig.C | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cinelerra-5.1/cinelerra/file.C b/cinelerra-5.1/cinelerra/file.C index a502b9f2..8179d0d3 100644 --- a/cinelerra-5.1/cinelerra/file.C +++ b/cinelerra-5.1/cinelerra/file.C @@ -622,8 +622,8 @@ int File::open_file(Preferences *preferences, } if( rd ) { -// one frame image file, no specific length - if( !this->asset->audio_data && +// one frame image file, not brender, no specific length + if( !this->asset->audio_data && this->asset->use_header && this->asset->video_data && !this->asset->single_frame && this->asset->video_length >= 0 && this->asset->video_length <= 1 ) { this->asset->single_frame = 1; diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C index 6b45541b..27aa6dfa 100644 --- a/cinelerra-5.1/cinelerra/mwindow.C +++ b/cinelerra-5.1/cinelerra/mwindow.C @@ -1004,6 +1004,7 @@ void MWindow::init_edl() edl->create_objects(); fill_preset_defaults(default_standard, edl->session); edl->load_defaults(defaults); + edl->session->brender_start = edl->session->brender_end = 0; edl->create_default_tracks(); edl->tracks->update_y_pixels(theme); } diff --git a/cinelerra-5.1/plugins/bluebanana/bluebananaconfig.C b/cinelerra-5.1/plugins/bluebanana/bluebananaconfig.C index c0c0d0a1..74ecf1b4 100644 --- a/cinelerra-5.1/plugins/bluebanana/bluebananaconfig.C +++ b/cinelerra-5.1/plugins/bluebanana/bluebananaconfig.C @@ -261,6 +261,7 @@ void BluebananaConfig::interpolate(BluebananaConfig &prev, Hadj_val = ( prev.Hadj_val*prev_scale + next.Hadj_val*next_scale); Oadj_val = ( prev.Oadj_val*prev_scale + next.Oadj_val*next_scale); + Aadj_val = ( prev.Aadj_val*prev_scale + next.Aadj_val*next_scale); Sadj_gamma = ( prev.Sadj_gamma*prev_scale + next.Sadj_gamma*next_scale); Sadj_lo = ( prev.Sadj_lo*prev_scale + next.Sadj_lo*next_scale); -- 2.26.2