diff options
Diffstat (limited to 'source/blender/editors/object/object_volume.c')
| -rw-r--r-- | source/blender/editors/object/object_volume.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/source/blender/editors/object/object_volume.c b/source/blender/editors/object/object_volume.c index bb619972e80..b7da91b70ba 100644 --- a/source/blender/editors/object/object_volume.c +++ b/source/blender/editors/object/object_volume.c @@ -109,11 +109,6 @@ static int volume_import_exec(bContext *C, wmOperator *op) BLI_path_rel(volume->filepath, BKE_main_blendfile_path(bmain)); } - volume->is_sequence = (range->length > 1); - volume->frame_duration = (volume->is_sequence) ? range->length : 0; - volume->frame_start = 1; - volume->frame_offset = (volume->is_sequence) ? range->offset - 1 : 0; - if (!BKE_volume_load(volume, bmain)) { BKE_reportf(op->reports, RPT_WARNING, @@ -134,6 +129,13 @@ static int volume_import_exec(bContext *C, wmOperator *op) continue; } + /* Set sequence parameters after trying to load the first frame, for file validation we want + * to use a consistent frame rather than whatever corresponds to the current scene frame. */ + volume->is_sequence = (range->length > 1); + volume->frame_duration = (volume->is_sequence) ? range->length : 0; + volume->frame_start = 1; + volume->frame_offset = (volume->is_sequence) ? range->offset - 1 : 0; + if (BKE_volume_is_y_up(volume)) { object->rot[0] += M_PI_2; } |