[Bf-blender-cvs] [1812ce5] multi_previews_id: Revert "Somewhat gracefully handle frame index out of bound error."

[Bastien Montagne]

Commit: 1812ce530d594a0e9b4144ad486e184dc6ba8e41
Author: Bastien Montagne
Date:   Mon Nov 14 15:49:13 2016 +0100
Branches: multi_previews_id
https://developer.blender.org/rB1812ce530d594a0e9b4144ad486e184dc6ba8e41

Revert "Somewhat gracefully handle frame index out of bound error."

This is not to be handled in BKE, but in calling code, BKE only asserts
values are valid.

This reverts commit e3fd455d3293f7b8bd15491a3e0193002b648abf.

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

M	source/blender/blenkernel/intern/icons.c
M	source/blender/editors/interface/interface_icons.c

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

diff --git a/source/blender/blenkernel/intern/icons.c b/source/blender/blenkernel/intern/icons.c
index 7ba2eee..838a732 100644
--- a/source/blender/blenkernel/intern/icons.c
+++ b/source/blender/blenkernel/intern/icons.c
@@ -283,12 +283,7 @@ void BKE_previewimg_frame_delete(struct PreviewImage *prv, const short frame_idx
 unsigned int *BKE_previewimg_frame_data_get(
         const PreviewImage *prv, const unsigned short frame_idx, const enum eIconSizes size, int *r_meta)
 {
-	BLI_assert(prv != NULL);
-
-	if (frame_idx >= prv->num_frames) {
-		printf("BKE_previewimg_frame_data_get: requested frame %i of %i\n", frame_idx, prv->num_frames);
-		return NULL;
-	}
+	BLI_assert(prv != NULL && frame_idx < prv->num_frames);
 
 	unsigned int *frame = NULL;
 	if (r_meta) {
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c
index 405125f..20ceb09 100644
--- a/source/blender/editors/interface/interface_icons.c
+++ b/source/blender/editors/interface/interface_icons.c
@@ -1370,10 +1370,7 @@ static void icon_draw_size(
 
 			if (frame_idx > 0) {
 				unsigned int *rect = BKE_previewimg_frame_data_get(pi, frame_idx, size, NULL);
-				if (rect) {
-					/* TODO: just prevent this NULL pointer in the first place */
-					icon_draw_rect(x, y, w, h, aspect, pi->w[size], pi->h[size], rect, alpha, rgb, is_preview);
-				}
+				icon_draw_rect(x, y, w, h, aspect, pi->w[size], pi->h[size], rect, alpha, rgb, is_preview);
 			}
 			else {
 				icon_draw_rect(x, y, w, h, aspect, pi->w[size], pi->h[size], pi->rect[size], alpha, rgb, is_preview);