[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12549] trunk/blender/source/blender/ blenkernel/intern/image.c: Exclude generated images when checking if an image is already loaded, it can be very confusing when you don' t appear to have the image loaded anywhere.

Campbell Barton ideasman42 at gmail.com
Sat Nov 10 20:56:06 CET 2007


Revision: 12549
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12549
Author:   campbellbarton
Date:     2007-11-10 20:56:06 +0100 (Sat, 10 Nov 2007)

Log Message:
-----------
Exclude generated images when checking if an image is already loaded, it can be very confusing when you don't appear to have the image loaded anywhere.

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	2007-11-10 15:31:41 UTC (rev 12548)
+++ trunk/blender/source/blender/blenkernel/intern/image.c	2007-11-10 19:56:06 UTC (rev 12549)
@@ -343,7 +343,7 @@
 	
 	/* first search an identical image */
 	for(ima= G.main->image.first; ima; ima= ima->id.next) {
-		if(ima->source!=IMA_SRC_VIEWER) {
+		if(ima->source!=IMA_SRC_VIEWER && ima->source!=IMA_SRC_GENERATED) {
 			BLI_strncpy(strtest, ima->name, sizeof(ima->name));
 			BLI_convertstringcode(strtest, G.sce, G.scene->r.cfra);
 			





More information about the Bf-blender-cvs mailing list