[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31562] trunk/blender/source/blender: bugfix

[Campbell Barton]

Revision: 31562
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31562
Author:   campbellbarton
Date:     2010-08-25 04:32:02 +0200 (Wed, 25 Aug 2010)

Log Message:
-----------
bugfix
- image filepath in the image view would only be set when first loading a frame.
- check to free animated image buffers on opengl render was comparing against the wrong value.

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

Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c	2010-08-25 02:18:37 UTC (rev 31561)
+++ trunk/blender/source/blender/blenkernel/intern/image.c	2010-08-25 02:32:02 UTC (rev 31562)
@@ -1979,8 +1979,14 @@
 			ibuf= image_get_ibuf(ima, 0, frame);
 			
 			/* XXX temp stuff? */
-			if(ima->lastframe != frame)
+			if(ima->lastframe != frame) {
 				ima->tpageflag |= IMA_TPAGE_REFRESH;
+				if(ibuf) {
+					/* without this the image name only updates
+					 * on first load which is quite confusing */
+					BLI_strncpy(ima->name, ibuf->name, sizeof(ima->name));
+				}
+			}
 			ima->lastframe = frame;
 		}	
 		else if(ima->type==IMA_TYPE_MULTILAYER) {

Modified: trunk/blender/source/blender/gpu/intern/gpu_draw.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_draw.c	2010-08-25 02:18:37 UTC (rev 31561)
+++ trunk/blender/source/blender/gpu/intern/gpu_draw.c	2010-08-25 02:32:02 UTC (rev 31562)
@@ -861,7 +861,7 @@
 
 	if(G.main)
 		for(ima=G.main->image.first; ima; ima=ima->id.next)
-			if(ELEM(ima->type, IMA_SRC_SEQUENCE, IMA_SRC_MOVIE))
+			if(ELEM(ima->source, IMA_SRC_SEQUENCE, IMA_SRC_MOVIE))
 				GPU_free_image(ima);
 }