[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16992] trunk/blender/source/blender/src/ buttons_shading.c: Bugfix #8911

Ton Roosendaal ton at blender.org
Thu Oct 9 12:59:51 CEST 2008


Revision: 16992
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16992
Author:   ton
Date:     2008-10-09 12:59:48 +0200 (Thu, 09 Oct 2008)

Log Message:
-----------
Bugfix #8911

Image counter can be set to zero when unlinking images, whilst they can
be in use for texture. This is a temporary solution to prevent errors!

(Now image unlinking doesn't set zero users anymore)

Modified Paths:
--------------
    trunk/blender/source/blender/src/buttons_shading.c

Modified: trunk/blender/source/blender/src/buttons_shading.c
===================================================================
--- trunk/blender/source/blender/src/buttons_shading.c	2008-10-09 06:20:16 UTC (rev 16991)
+++ trunk/blender/source/blender/src/buttons_shading.c	2008-10-09 10:59:48 UTC (rev 16992)
@@ -862,7 +862,9 @@
 	
 	if(ima_pp && *ima_pp) {
 		Image *ima= *ima_pp;
-		ima->id.us--;
+		/* (for time being, texturefaces are no users, conflict in design...) */
+		if(ima->id.us>1)
+			ima->id.us--;
 		*ima_pp= NULL;
 	}
 }





More information about the Bf-blender-cvs mailing list