diff options
author | Jesse Yurkovich <jesse.y@gmail.com> | 2022-05-28 08:16:14 +0300 |
---|---|---|
committer | Jesse Yurkovich <jesse.y@gmail.com> | 2022-05-28 08:16:14 +0300 |
commit | 138a4846e2dbb719a4e8f39b7ffd2d0f95db06c6 (patch) | |
tree | c732bcfa2d3213db66eb0435bcdff20d462c3dc1 /source/blender/editors/space_image | |
parent | 3f1f4df3fd9b37fb97fbf4632725032de87d0828 (diff) | |
parent | 86baf6e3edc8925c0701786550b2bac8fe5203d3 (diff) |
Merge remote-tracking branch 'origin/blender-v3.2-release'
Diffstat (limited to 'source/blender/editors/space_image')
-rw-r--r-- | source/blender/editors/space_image/image_ops.c | 6 | ||||
-rw-r--r-- | source/blender/editors/space_image/image_sequence.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index 336331e44e7..69efd5eaabf 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -1274,8 +1274,8 @@ static Image *image_open_single(Main *bmain, BKE_image_free_views(ima); } - if ((range->length > 1) && (ima->source == IMA_SRC_FILE)) { - if (range->udim_tiles.first) { + if (ima->source == IMA_SRC_FILE) { + if (range->udims_detected && range->udim_tiles.first) { ima->source = IMA_SRC_TILED; ImageTile *first_tile = ima->tiles.first; first_tile->tile_number = range->offset; @@ -1283,7 +1283,7 @@ static Image *image_open_single(Main *bmain, BKE_image_add_tile(ima, POINTER_AS_INT(node->data), NULL); } } - else { + else if (range->length > 1) { ima->source = IMA_SRC_SEQUENCE; } } diff --git a/source/blender/editors/space_image/image_sequence.c b/source/blender/editors/space_image/image_sequence.c index 365cf2542b2..fbeef47e278 100644 --- a/source/blender/editors/space_image/image_sequence.c +++ b/source/blender/editors/space_image/image_sequence.c @@ -107,10 +107,10 @@ static void image_detect_frame_range(ImageFrameRange *range, const bool detect_u /* UDIM */ if (detect_udim) { int udim_start, udim_range; - bool result = BKE_image_get_tile_info( + range->udims_detected = BKE_image_get_tile_info( range->filepath, &range->udim_tiles, &udim_start, &udim_range); - if (result) { + if (range->udims_detected) { range->offset = udim_start; range->length = udim_range; return; |