Revision: 49656
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49656
Author: dingto
Date: 2012-08-07 14:02:53 +0000 (Tue, 07 Aug 2012)
Log Message:
-----------
Tomato Cycles:
* Improvement for reporting current sample.
Also show the current amount of rendered samples, when using the CPU, and 1x1
tiles.
Modified Paths:
--------------
branches/soc-2011-tomato/intern/cycles/render/session.cpp
Modified: branches/soc-2011-tomato/intern/cycles/render/session.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/render/session.cpp 2012-08-07
13:51:19 UTC (rev 49655)
+++ branches/soc-2011-tomato/intern/cycles/render/session.cpp 2012-08-07
14:02:53 UTC (rev 49656)
@@ -656,11 +656,13 @@
if(!params.progressive) {
substatus = string_printf("Path Tracing Tile %d/%d", tile,
num_tiles);
- if(params.device.type == DEVICE_CUDA || params.device.type ==
DEVICE_OPENCL) {
+ if(params.device.type == DEVICE_CUDA || params.device.type ==
DEVICE_OPENCL ||
+ (params.device.type == DEVICE_CPU && num_tiles == 1)) {
/* when rendering on GPU multithreading happens within
single tile, as in
* tiles are handling sequentially and in this case we
could display
* currently rendering sample number
- * this helps a lot from feedback point of view
+ * this helps a lot from feedback point of view.
+ * also display the info on CPU, when using 1 tile only
*/
int sample = progress.get_sample(), num_samples =
tile_manager.state.num_samples;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
