diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-01-15 12:28:35 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-01-15 12:29:14 +0300 |
| commit | 1ec44b22e9137845465fe0db493a6c4263fc49ae (patch) | |
| tree | 072a0c952fb61abac3ef355fb24a3bd3518313b8 /intern/cycles/blender/blender_session.cpp | |
| parent | a0fd7ab28d5365985c8684079097e102915a3bde (diff) | |
Make grumpy gcc happy (double to float conversion...).
Diffstat (limited to 'intern/cycles/blender/blender_session.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_session.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp index a8958db467b..eb3f54ae90c 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; } |