[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39771] branches/cycles/intern/cycles/ render/session.cpp: Cycles: fix cuda assertion that could be triggerd sometimes, when trying to
Brecht Van Lommel
brechtvanlommel at pandora.be
Mon Aug 29 13:47:03 CEST 2011
Revision: 39771
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39771
Author: blendix
Date: 2011-08-29 11:47:03 +0000 (Mon, 29 Aug 2011)
Log Message:
-----------
Cycles: fix cuda assertion that could be triggerd sometimes, when trying to
tonemap an empty image.
Modified Paths:
--------------
branches/cycles/intern/cycles/render/session.cpp
Modified: branches/cycles/intern/cycles/render/session.cpp
===================================================================
--- branches/cycles/intern/cycles/render/session.cpp 2011-08-29 10:21:10 UTC (rev 39770)
+++ branches/cycles/intern/cycles/render/session.cpp 2011-08-29 11:47:03 UTC (rev 39771)
@@ -508,11 +508,13 @@
task.pass = tile_manager.state.pass;
task.resolution = tile_manager.state.resolution;
- device->task_add(task);
- device->task_wait();
+ if(task.w > 0 && task.h > 0) {
+ device->task_add(task);
+ device->task_wait();
- /* set display to new size */
- display->draw_set(tile_manager.state.width, tile_manager.state.height);
+ /* set display to new size */
+ display->draw_set(task.w, task.h);
+ }
display_outdated = false;
}
More information about the Bf-blender-cvs
mailing list