Revision: 49642
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49642
Author: nazgul
Date: 2012-08-07 09:54:55 +0000 (Tue, 07 Aug 2012)
Log Message:
-----------
Code cleanup: remove unused sample counter from render session
It's not used since new tile-based rendering and it was confusing
to have it in both session and tile manager.
Should be no functional changes.
Modified Paths:
--------------
branches/soc-2011-tomato/intern/cycles/render/session.cpp
branches/soc-2011-tomato/intern/cycles/render/session.h
Modified: branches/soc-2011-tomato/intern/cycles/render/session.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/render/session.cpp 2012-08-07
09:22:26 UTC (rev 49641)
+++ branches/soc-2011-tomato/intern/cycles/render/session.cpp 2012-08-07
09:54:55 UTC (rev 49642)
@@ -61,7 +61,6 @@
reset_time = 0.0;
preview_time = 0.0;
paused_time = 0.0;
- sample = 0;
delayed_reset.do_reset = false;
delayed_reset.samples = 0;
@@ -569,7 +568,6 @@
start_time = time_dt();
preview_time = 0.0;
paused_time = 0.0;
- sample = 0;
if(!params.background)
progress.set_start_time(start_time + paused_time);
Modified: branches/soc-2011-tomato/intern/cycles/render/session.h
===================================================================
--- branches/soc-2011-tomato/intern/cycles/render/session.h 2012-08-07
09:22:26 UTC (rev 49641)
+++ branches/soc-2011-tomato/intern/cycles/render/session.h 2012-08-07
09:54:55 UTC (rev 49642)
@@ -103,7 +103,6 @@
Progress progress;
SessionParams params;
TileManager tile_manager;
- int sample;
boost::function<void(RenderTile&)> write_render_tile_cb;
boost::function<void(RenderTile&)> update_render_tile_cb;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
