[Bf-blender-cvs] [1ec44b2] master: Make grumpy gcc happy (double to float conversion...).

Bastien Montagne noreply at git.blender.org
Thu Jan 15 10:29:26 CET 2015


Commit: 1ec44b22e9137845465fe0db493a6c4263fc49ae
Author: Bastien Montagne
Date:   Thu Jan 15 10:28:35 2015 +0100
Branches: master
https://developer.blender.org/rB1ec44b22e9137845465fe0db493a6c4263fc49ae

Make grumpy gcc happy (double to float conversion...).

===================================================================

M	intern/cycles/blender/blender_session.cpp

===================================================================

diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp
index a8958db..eb3f54a 100644
--- a/intern/cycles/blender/blender_session.cpp
+++ b/intern/cycles/blender/blender_session.cpp
@@ -794,7 +794,7 @@ void BlenderSession::get_progress(float& progress, double& total_time, double& r
 	if(background && samples_per_tile && tile_total)
 		progress = ((float)sample / (float)(tile_total * samples_per_tile));
 	else if(!background && samples > 0 && total_samples != USHRT_MAX)
-		progress = ((double)samples) / total_samples;
+		progress = ((float)samples) / total_samples;
 	else
 		progress = 0.0;
 }




More information about the Bf-blender-cvs mailing list