[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29657] branches/render25/source/blender/ render/intern/source: Render Branch: move tile cache init a bit earlier to fix baking crash.
Brecht Van Lommel
brecht at blender.org
Wed Jun 23 18:56:29 CEST 2010
Revision: 29657
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29657
Author: blendix
Date: 2010-06-23 18:56:29 +0200 (Wed, 23 Jun 2010)
Log Message:
-----------
Render Branch: move tile cache init a bit earlier to fix baking crash.
Modified Paths:
--------------
branches/render25/source/blender/render/intern/source/bake.c
branches/render25/source/blender/render/intern/source/convertblender.c
Modified: branches/render25/source/blender/render/intern/source/bake.c
===================================================================
--- branches/render25/source/blender/render/intern/source/bake.c 2010-06-23 16:35:42 UTC (rev 29656)
+++ branches/render25/source/blender/render/intern/source/bake.c 2010-06-23 16:56:29 UTC (rev 29657)
@@ -710,7 +710,6 @@
}
}
- IMB_tile_cache_params(re->params.r.threads, U.imagetilememory);
BLI_init_threads(&threads, do_bake_thread, re->params.r.threads);
handles= MEM_callocN(sizeof(BakeShade)*re->params.r.threads, "BakeShade");
Modified: branches/render25/source/blender/render/intern/source/convertblender.c
===================================================================
--- branches/render25/source/blender/render/intern/source/convertblender.c 2010-06-23 16:35:42 UTC (rev 29656)
+++ branches/render25/source/blender/render/intern/source/convertblender.c 2010-06-23 16:56:29 UTC (rev 29657)
@@ -1525,6 +1525,7 @@
re->params.r= scene->r;
RE_init_threadcount(re);
+ IMB_tile_cache_params(re->params.r.threads, U.imagetilememory);
re->params.flag |= R_BAKING;
re->db.excludeob= actob;
More information about the Bf-blender-cvs
mailing list