blender
/
blender
137
426
Fork 612
Code Issues 6.3k Pull Requests 780 Projects 19 Wiki Activity

VSE: indicate missing media in timeline/display #116869

Merged
Aras Pranckevicius merged 18 commits from aras_p/blender:vse-missing-media into main 2024-04-24 19:54:59 +02:00
Conversation 4 Commits 18 Files Changed 21 +5 -4
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 693a17e57e - Show all commits

2
source/blender/editors/space_sequencer/sequencer_thumbnails.cc
View File

@ -189,7 +189,7 @@ static SeqRenderData sequencer_thumbnail_context_init(const bContext *C)
SEQ_render_new_render_data(bmain, depsgraph, scene, 0, 0, sseq->render_size, false, &context);
context.view_id = BKE_scene_multiview_view_id_get(&scene->r, STEREO_LEFT_NAME);
context.use_proxies = false;
context.never_show_missing_media = true;
context.ignore_missing_media = true;
aras_p marked this conversation as resolved Outdated
Richard Antalik commented 2024-01-10 21:14:18 +01:00
Outdated
Review
Copy Link

Nitpick: Could this be called "ignore missing media" or something like that? Currently it's not double negative, but reads strange to me.

Nitpick: Could this be called "ignore missing media" or something like that? Currently it's not double negative, but reads strange to me.
context.scene = scene;
return context;

1
source/blender/makesdna/DNA_scene_defaults.h
View File

@ -112,6 +112,7 @@
\
.seq_prev_type = OB_SOLID, \
.seq_rend_type = OB_SOLID, \
.seq_flag = 0, \
\
aras_p marked this conversation as resolved Outdated
Richard Antalik commented 2024-01-10 21:10:44 +01:00
Outdated
Review
Copy Link

I guess missing DNA defaults would be initialized to 0 anyway, but this is technically unrelated change and should not be done here.

I guess missing DNA defaults would be initialized to 0 anyway, but this is technically unrelated change and should not be done here.
.threads = 1, \
\

2
source/blender/sequencer/SEQ_render.hh
View File

@ -34,7 +34,7 @@ struct SeqRenderData {
int recty;
int preview_render_size;
bool use_proxies;
bool never_show_missing_media;
bool ignore_missing_media;
int for_render;
int motion_blur_samples;
float motion_blur_shutter;

4
source/blender/sequencer/intern/render.cc
View File

@ -231,7 +231,7 @@ void SEQ_render_new_render_data(Main *bmain,
r_context->rectx = rectx;
r_context->recty = recty;
r_context->preview_render_size = preview_render_size;
r_context->never_show_missing_media = false;
r_context->ignore_missing_media = false;
r_context->for_render = for_render;
r_context->motion_blur_samples = 0;
r_context->motion_blur_shutter = 0;
@ -968,7 +968,7 @@ static bool seq_image_strip_is_multiview_render(
static ImBuf *create_missing_media_image(const SeqRenderData *context, const StripElem *orig)
{
if (context->never_show_missing_media) {
if (context->ignore_missing_media) {
return nullptr;
}
if (context->scene == nullptr || context->scene->ed == nullptr ||