diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2014-10-16 21:08:32 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2014-10-16 21:08:56 +0400 |
| commit | 0750e4c4c7eee9ad8f57ebf1243960bd46c7c1f9 (patch) | |
| tree | 15c6e2e37455a37a2b9371d2544ecfd820454827 /source/blender/blenkernel/intern/image.c | |
| parent | d30abdf3ec28b8e66c86cd37138efc2270375596 (diff) | |
Minor typo
Diffstat (limited to 'source/blender/blenkernel/intern/image.c')
| -rw-r--r-- | source/blender/blenkernel/intern/image.c | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index 5c673eeef3f..caf146cef6a 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -249,7 +249,7 @@ void BKE_image_de_interlace(Image *ima, int odd) /* ***************** ALLOC & FREE, DATA MANAGING *************** */ -static void image_free_cahced_frames(Image *image) +static void image_free_cached_frames(Image *image) { if (image->cache) { IMB_moviecache_free(image->cache); @@ -263,7 +263,7 @@ static void image_free_cahced_frames(Image *image) */ void BKE_image_free_buffers(Image *ima) { - image_free_cahced_frames(ima); + image_free_cached_frames(ima); if (ima->anim) IMB_free_anim(ima->anim); ima->anim = NULL; @@ -2220,9 +2220,11 @@ void BKE_image_signal(Image *ima, ImageUser *iuser, int signal) switch (signal) { case IMA_SIGNAL_FREE: - BKE_image_free_buffers(ima); - if (iuser) - iuser->ok = 1; + if (ima->type != IMA_SRC_GENERATED || ima->gen_type != IMA_GENTYPE_BLANK) { + BKE_image_free_buffers(ima); + if (iuser) + iuser->ok = 1; + } break; case IMA_SIGNAL_SRC_CHANGE: if (ima->type == IMA_TYPE_UV_TEST) @@ -2286,7 +2288,7 @@ void BKE_image_signal(Image *ima, ImageUser *iuser, int signal) printf("ERROR: Image not available. Keeping packed image\n"); } } - else + else if (ima->type != IMA_SRC_GENERATED || ima->gen_type != IMA_GENTYPE_BLANK) BKE_image_free_buffers(ima); if (iuser) @@ -2305,13 +2307,14 @@ void BKE_image_signal(Image *ima, ImageUser *iuser, int signal) } break; case IMA_SIGNAL_COLORMANAGE: - BKE_image_free_buffers(ima); - - ima->ok = 1; + if (ima->type != IMA_SRC_GENERATED || ima->gen_type != IMA_GENTYPE_BLANK) { + BKE_image_free_buffers(ima); - if (iuser) - iuser->ok = 1; + ima->ok = 1; + if (iuser) + iuser->ok = 1; + } break; } @@ -2529,7 +2532,7 @@ static ImBuf *image_load_sequence_multilayer(Image *ima, ImageUser *iuser, int f * need to ensure there's no image buffers are hanging around * with dead links after freeing the render result. */ - image_free_cahced_frames(ima); + image_free_cached_frames(ima); RE_FreeRenderResult(ima->rr); ima->rr = NULL; } |