[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52159] trunk/blender/intern/cycles: avoid divide by zero in cycles progress calculation

[Campbell Barton]

Revision: 52159
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52159
Author:   campbellbarton
Date:     2012-11-13 01:53:07 +0000 (Tue, 13 Nov 2012)
Log Message:
-----------
avoid divide by zero in cycles progress calculation

Modified Paths:
--------------
    trunk/blender/intern/cycles/blender/blender_session.cpp
    trunk/blender/intern/cycles/render/session.cpp

Modified: trunk/blender/intern/cycles/blender/blender_session.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_session.cpp	2012-11-13 00:54:57 UTC (rev 52158)
+++ trunk/blender/intern/cycles/blender/blender_session.cpp	2012-11-13 01:53:07 UTC (rev 52159)
@@ -518,8 +518,8 @@
 	sample = session->progress.get_sample();
 	samples_per_tile = session->params.samples;
 
-	if(samples_per_tile)
-		progress = ((float)sample/(float)(tile_total * samples_per_tile));
+	if(samples_per_tile && tile_total)
+		progress = ((float)sample / (float)(tile_total * samples_per_tile));
 	else
 		progress = 0.0;
 }

Modified: trunk/blender/intern/cycles/render/session.cpp
===================================================================
--- trunk/blender/intern/cycles/render/session.cpp	2012-11-13 00:54:57 UTC (rev 52158)
+++ trunk/blender/intern/cycles/render/session.cpp	2012-11-13 01:53:07 UTC (rev 52159)
@@ -757,7 +757,7 @@
 	if(preview_time == 0.0 && resolution == 1)
 		preview_time = time_dt();
 	
-	double tile_time = (tile == 0)? 0.0: (time_dt() - preview_time - paused_time)/(sample);
+	double tile_time = (tile == 0 || sample == 0)? 0.0: (time_dt() - preview_time - paused_time) / sample;
 
 	/* negative can happen when we pause a bit before rendering, can discard that */
 	if(preview_time < 0.0) preview_time = 0.0;