[Bf-blender-cvs] [962311358bd] temp-udim-images: Don't handle first tile twice in image drawing and saving

[Lukas Stockner]

Commit: 962311358bd02b03ddfffb07ba80f25e2cee29d0
Author: Lukas Stockner
Date:   Thu Jun 28 02:21:12 2018 +0200
Branches: temp-udim-images
https://developer.blender.org/rB962311358bd02b03ddfffb07ba80f25e2cee29d0

Don't handle first tile twice in image drawing and saving

===================================================================

M	source/blender/editors/space_image/image_draw.c
M	source/blender/editors/space_image/image_ops.c

===================================================================

diff --git a/source/blender/editors/space_image/image_draw.c b/source/blender/editors/space_image/image_draw.c
index 6091b4587cb..3c5e80643e7 100644
--- a/source/blender/editors/space_image/image_draw.c
+++ b/source/blender/editors/space_image/image_draw.c
@@ -828,6 +828,9 @@ void draw_image_main(const bContext *C, ARegion *ar)
 
 	if (ima && ima->source == IMA_SRC_TILED) {
 		LISTBASE_FOREACH(ImageTile*, tile, &ima->tiles) {
+			if (tile->tile_number == 0)
+				continue;
+
 			ibuf = ED_space_image_acquire_buffer(sima, &lock, tile->tile_number);
 			if (ibuf) {
 				int x_pos = tile->tile_number % 10;
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index d37f6bc39de..65355ecf35a 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -2132,6 +2132,9 @@ static bool save_image_doit(bContext *C, SpaceImage *sima, wmOperator *op, SaveI
 		char filepath[FILE_MAX];
 		BLI_strncpy(filepath, simopts->filepath, sizeof(filepath));
 		LISTBASE_FOREACH(ImageTile*, tile, &ima->tiles) {
+			if (tile->tile_number == 0)
+				continue;
+
 			char head[FILE_MAX], tail[FILE_MAX];
 			unsigned short numlen;
 			BLI_stringdec(filepath, head, tail, &numlen);