blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 764 Projects 19 Wiki Activity

Merge branch 'blender-v3.2-release'

This commit is contained in:
Richard Antalik 2022-05-03 10:56:24 +02:00
parent 6b74c8e486 a2e3005b42
commit 46d7bcc068
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/space_sequencer/sequencer_draw.c
View File

@ -631,7 +631,7 @@ static void drawmeta_contents(Scene *scene,
color3ubv_from_seq(scene, seq, show_strip_color_tag, col);
}
if (SEQ_render_is_muted(channels, seqm) || SEQ_render_is_muted(channels, seq)) {
if (SEQ_render_is_muted(channels, seqm) || SEQ_render_is_muted(&seqm->channels, seq)) {
col[3] = 64;
}
else {

2
source/blender/editors/space_sequencer/space_sequencer.c
View File

@ -600,6 +600,8 @@ static void sequencer_main_clamp_view(const bContext *C, ARegion *region)
view_clamped.ymin = strip_boundbox.ymin;
view_clamped.ymax = min_ff(strip_boundbox.ymax, strip_boundbox.ymin + range_y);
}
v2d->cur = view_clamped;
}
static void sequencer_main_region_clamp_custom_set(const bContext *C, ARegion *region)