[Bf-blender-cvs] [8f1e015] master: Revert "Minor typo".

[Antony Riakiotakis]

Commit: 8f1e015d7596293aa4c99812c6690588d2d23a5d
Author: Antony Riakiotakis
Date:   Thu Oct 16 20:33:19 2014 +0200
Branches: master
https://developer.blender.org/rB8f1e015d7596293aa4c99812c6690588d2d23a5d

Revert "Minor typo".

This was supposed to be an experimental commit, shouldn't be in master at all, sorry for that

This reverts commit 0750e4c4c7eee9ad8f57ebf1243960bd46c7c1f9.

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

M	source/blender/blenkernel/intern/image.c

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

diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index caf146c..5c673ee 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_cached_frames(Image *image)
+static void image_free_cahced_frames(Image *image)
 {
 	if (image->cache) {
 		IMB_moviecache_free(image->cache);
@@ -263,7 +263,7 @@ static void image_free_cached_frames(Image *image)
  */
 void BKE_image_free_buffers(Image *ima)
 {
-	image_free_cached_frames(ima);
+	image_free_cahced_frames(ima);
 
 	if (ima->anim) IMB_free_anim(ima->anim);
 	ima->anim = NULL;
@@ -2220,11 +2220,9 @@ void BKE_image_signal(Image *ima, ImageUser *iuser, int signal)
 
 	switch (signal) {
 		case IMA_SIGNAL_FREE:
-			if (ima->type != IMA_SRC_GENERATED || ima->gen_type != IMA_GENTYPE_BLANK) {
-				BKE_image_free_buffers(ima);
-				if (iuser)
-					iuser->ok = 1;
-			}
+			BKE_image_free_buffers(ima);
+			if (iuser)
+				iuser->ok = 1;
 			break;
 		case IMA_SIGNAL_SRC_CHANGE:
 			if (ima->type == IMA_TYPE_UV_TEST)
@@ -2288,7 +2286,7 @@ void BKE_image_signal(Image *ima, ImageUser *iuser, int signal)
 					printf("ERROR: Image not available. Keeping packed image\n");
 				}
 			}
-			else if (ima->type != IMA_SRC_GENERATED || ima->gen_type != IMA_GENTYPE_BLANK)
+			else
 				BKE_image_free_buffers(ima);
 
 			if (iuser)
@@ -2307,14 +2305,13 @@ void BKE_image_signal(Image *ima, ImageUser *iuser, int signal)
 			}
 			break;
 		case IMA_SIGNAL_COLORMANAGE:
-			if (ima->type != IMA_SRC_GENERATED || ima->gen_type != IMA_GENTYPE_BLANK) {
-				BKE_image_free_buffers(ima);
+			BKE_image_free_buffers(ima);
 
-				ima->ok = 1;
+			ima->ok = 1;
+
+			if (iuser)
+				iuser->ok = 1;
 
-				if (iuser)
-					iuser->ok = 1;
-			}
 			break;
 	}
 
@@ -2532,7 +2529,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_cached_frames(ima);
+			image_free_cahced_frames(ima);
 			RE_FreeRenderResult(ima->rr);
 			ima->rr = NULL;
 		}