diff options
Diffstat (limited to 'source/blender/editors/space_sequencer')
| -rw-r--r-- | source/blender/editors/space_sequencer/sequencer_add.c | 10 | ||||
| -rw-r--r-- | source/blender/editors/space_sequencer/sequencer_edit.c | 9 |
2 files changed, 12 insertions, 7 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c index ff8cbdb1a59..16b690dd6e4 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.c +++ b/source/blender/editors/space_sequencer/sequencer_add.c @@ -254,11 +254,11 @@ static void load_data_init_from_operator(SeqLoadData *load_data, bContext *C, wm BLI_strncpy(load_data->name, BLI_path_basename(load_data->path), sizeof(load_data->name)); } else if ((prop = RNA_struct_find_property(op->ptr, "directory"))) { - char *directory = RNA_string_get_alloc(op->ptr, "directory", NULL, 0); + char *directory = RNA_string_get_alloc(op->ptr, "directory", NULL, 0, NULL); if ((prop = RNA_struct_find_property(op->ptr, "files"))) { RNA_PROP_BEGIN (op->ptr, itemptr, prop) { - char *filename = RNA_string_get_alloc(&itemptr, "name", NULL, 0); + char *filename = RNA_string_get_alloc(&itemptr, "name", NULL, 0, NULL); BLI_strncpy(load_data->name, filename, sizeof(load_data->name)); BLI_join_dirfile(load_data->path, sizeof(load_data->path), directory, filename); MEM_freeN(filename); @@ -944,7 +944,7 @@ int sequencer_image_seq_get_minmax_frame(wmOperator *op, RNA_BEGIN (op->ptr, itemptr, "files") { char *filename; int frame; - filename = RNA_string_get_alloc(&itemptr, "name", NULL, 0); + filename = RNA_string_get_alloc(&itemptr, "name", NULL, 0, NULL); if (filename) { if (BLI_path_frame_get(filename, &frame, &numdigits)) { @@ -973,7 +973,7 @@ void sequencer_image_seq_reserve_frames( { char *filename = NULL; RNA_BEGIN (op->ptr, itemptr, "files") { - filename = RNA_string_get_alloc(&itemptr, "name", NULL, 0); + filename = RNA_string_get_alloc(&itemptr, "name", NULL, 0, NULL); break; } RNA_END; @@ -1023,7 +1023,7 @@ static void sequencer_add_image_strip_load_files( else { size_t strip_frame = 0; RNA_BEGIN (op->ptr, itemptr, "files") { - char *filename = RNA_string_get_alloc(&itemptr, "name", NULL, 0); + char *filename = RNA_string_get_alloc(&itemptr, "name", NULL, 0, NULL); SEQ_add_image_load_file(seq, strip_frame, filename); MEM_freeN(filename); strip_frame++; diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index afad8999e88..694e5fbb41d 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -1446,9 +1446,14 @@ static int sequencer_split_exec(bContext *C, wmOperator *op) } if (ignore_selection || seq->flag & SELECT) { - if (SEQ_edit_strip_split(bmain, scene, ed->seqbasep, seq, split_frame, method) != NULL) { + const char *error_msg = NULL; + if (SEQ_edit_strip_split(bmain, scene, ed->seqbasep, seq, split_frame, method, &error_msg) != + NULL) { changed = true; } + if (error_msg != NULL) { + BKE_report(op->reports, RPT_ERROR, error_msg); + } } } @@ -2826,7 +2831,7 @@ static int sequencer_change_path_exec(bContext *C, wmOperator *op) } else { RNA_BEGIN (op->ptr, itemptr, "files") { - char *filename = RNA_string_get_alloc(&itemptr, "name", NULL, 0); + char *filename = RNA_string_get_alloc(&itemptr, "name", NULL, 0, NULL); BLI_strncpy(se->name, filename, sizeof(se->name)); MEM_freeN(filename); se++; |