Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brecht@blender.org>2021-11-17 19:22:05 +0300
committerBrecht Van Lommel <brecht@blender.org>2021-11-17 19:29:41 +0300
commit89d5714d8f233b4bbb83f6a7b33237e2ec04ee79 (patch)
treebeee985786bb7660ec42f7f11bda91bc77c31bc9 /intern/cycles/util/progress.h
parentea7efa556936851075c2bda2f772ba4a7674a01c (diff)
Build: match GCC and Clang float conversion warnings in Cycles
Diffstat (limited to 'intern/cycles/util/progress.h')
-rw-r--r--intern/cycles/util/progress.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/util/progress.h b/intern/cycles/util/progress.h
index f2d80e49ab8..15bd26d34bf 100644
--- a/intern/cycles/util/progress.h
+++ b/intern/cycles/util/progress.h
@@ -207,7 +207,7 @@ class Progress {
if (total_pixel_samples > 0) {
return ((double)pixel_samples) / (double)total_pixel_samples;
}
- return 0.0f;
+ return 0.0;
}
void add_samples(uint64_t pixel_samples_, int tile_sample)