Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2016-11-14 17:49:13 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2016-11-14 17:49:13 +0300
commit1812ce530d594a0e9b4144ad486e184dc6ba8e41 (patch)
tree55dedab7acb5d97831eba3ab76f75f6562aba9c0 /source/blender/blenkernel/intern
parentd955781fe0646a64645abd32217d50a346d35b05 (diff)
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.
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r--source/blender/blenkernel/intern/icons.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/icons.c b/source/blender/blenkernel/intern/icons.c
index 7ba2eeefe8e..838a732e387 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) {