Merge branch 'blender-v3.2-release'
This commit is contained in:
@@ -550,6 +550,10 @@ static void sequencer_main_clamp_view(const bContext *C, ARegion *region)
|
||||
View2D *v2d = ®ion->v2d;
|
||||
Editing *ed = SEQ_editing_get(CTX_data_scene(C));
|
||||
|
||||
if (ed == NULL) {
|
||||
return;
|
||||
}
|
||||
|
||||
/* Transformation uses edge panning to move view. Also if smooth view is running, don't apply
|
||||
* clamping to prevent overriding this functionality. */
|
||||
if (G.moving || v2d->smooth_timer != NULL) {
|
||||
|
||||
@@ -2712,7 +2712,6 @@ static ImBuf *do_speed_effect(const SeqRenderData *context,
|
||||
ImBuf *out;
|
||||
|
||||
if (s->flags & SEQ_SPEED_USE_INTERPOLATION) {
|
||||
out = prepare_effect_imbufs(context, ibuf1, ibuf2, ibuf3);
|
||||
fac = speed_effect_interpolation_ratio_get(context->scene, seq, timeline_frame);
|
||||
/* Current frame is ibuf1, next frame is ibuf2. */
|
||||
out = seq_render_effect_execute_threaded(
|
||||
|
||||
Reference in New Issue
Block a user