[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34992] trunk/blender/source/blender/ blenkernel/intern/image.c: Bugfix #26015
Ton Roosendaal
ton at blender.org
Sat Feb 19 15:32:34 CET 2011
Revision: 34992
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34992
Author: ton
Date: 2011-02-19 14:32:34 +0000 (Sat, 19 Feb 2011)
Log Message:
-----------
Bugfix #26015
A very Bad Bug!
On every draw-object, a function free_old_images() was called which
was freeing "unused" images during renders/bakes
This was a left-over from 2.4x code, missed it altogether.
I'm sure this fix will solve a lot of render crashing... :)
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 2011-02-19 13:46:08 UTC (rev 34991)
+++ trunk/blender/source/blender/blenkernel/intern/image.c 2011-02-19 14:32:34 UTC (rev 34992)
@@ -526,6 +526,10 @@
if (U.textimeout == 0 || ctime % U.texcollectrate || ctime == lasttime)
return;
+ /* of course not! */
+ if (G.rendering)
+ return;
+
lasttime = ctime;
ima= G.main->image.first;
@@ -2182,10 +2186,7 @@
BLI_unlock_thread(LOCK_IMAGE);
}
- /* we assuming that if it is not rendering, it's also not multithreaded
- * (a somewhat weak assumption) */
- if(G.rendering==0)
- tag_image_time(ima);
+ tag_image_time(ima);
return ibuf;
}
More information about the Bf-blender-cvs
mailing list