[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33426] trunk/blender/source/blender/ blenkernel/intern/image.c: IRC comment fix:

[Ton Roosendaal]

Revision: 33426
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33426
Author:   ton
Date:     2010-12-02 17:12:55 +0100 (Thu, 02 Dec 2010)

Log Message:
-----------
IRC comment fix:

Option "free all texture-images" after render, was also
freeing unsaved painted images. Now it skips them.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/image.c

Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c	2010-12-02 14:52:07 UTC (rev 33425)
+++ trunk/blender/source/blender/blenkernel/intern/image.c	2010-12-02 16:12:55 UTC (rev 33426)
@@ -607,15 +607,21 @@
 	
 	for(ima= G.main->image.first; ima; ima= ima->id.next) {
 		if(ima->ibufs.first && (ima->id.flag & LIB_DOIT)) {
-			/*
 			ImBuf *ibuf;
+			
 			for(ibuf= ima->ibufs.first; ibuf; ibuf= ibuf->next) {
-				if(ibuf->mipmap[0]) 
+				/* escape when image is painted on */
+				if(ibuf->userflags & IB_BITMAPDIRTY)
+					break;
+				
+				/* if(ibuf->mipmap[0]) 
 					totsize+= 1.33*ibuf->x*ibuf->y*4;
 				else
-					totsize+= ibuf->x*ibuf->y*4;
-			} */
-			image_free_buffers(ima);
+					totsize+= ibuf->x*ibuf->y*4;*/
+				
+			}
+			if(ibuf==NULL)
+				image_free_buffers(ima);
 		}
 	}
 	/* printf("freed total %d MB\n", totsize/(1024*1024)); */