Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorRichard Antalik <richardantalik@gmail.com>2022-05-03 11:56:24 +0300
committerRichard Antalik <richardantalik@gmail.com>2022-05-03 11:56:24 +0300
commit46d7bcc06876e03f021d948ceb2df7a1cab10243 (patch)
tree40e41c2f6f31dfc10c35295633672a4d0f6b88e0 /source
parent6b74c8e486623d7f3e50056bae7d9ffb103b3621 (diff)
parenta2e3005b422fe745ee2d53f1c00ca8c443e000c5 (diff)
Merge branch 'blender-v3.2-release'
Diffstat (limited to 'source')
-rw-r--r--source/blender/editors/space_sequencer/sequencer_draw.c2
-rw-r--r--source/blender/editors/space_sequencer/space_sequencer.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c
index 1c1694479d3..4cb41c702da 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -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 {
diff --git a/source/blender/editors/space_sequencer/space_sequencer.c b/source/blender/editors/space_sequencer/space_sequencer.c
index 2ce237a53f2..f95c5f196b6 100644
--- a/source/blender/editors/space_sequencer/space_sequencer.c
+++ b/source/blender/editors/space_sequencer/space_sequencer.c
@@ -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)