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:
authorSergey Sharybin <sergey.vfx@gmail.com>2017-01-25 13:18:12 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2017-01-25 13:18:12 +0300
commit8ea09252c8261c7057a130763c7f44bd45c9f9d2 (patch)
tree2a0e7e6bc6cce0d09418c51d46d68b7bba84c908
parent4cbfaa6f3f3c90fc0548aaa4de0c3fc3aea310c9 (diff)
Fix T50517: Rendering expecting time is negative
-rw-r--r--intern/cycles/render/tile.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/render/tile.cpp b/intern/cycles/render/tile.cpp
index e59d0c843a3..a493c3fa1cd 100644
--- a/intern/cycles/render/tile.cpp
+++ b/intern/cycles/render/tile.cpp
@@ -157,7 +157,7 @@ void TileManager::set_samples(int num_samples_)
divider >>= 1;
}
- state.total_pixel_samples = pixel_samples + get_num_effective_samples() * params.width*params.height;
+ state.total_pixel_samples = pixel_samples + (uint64_t)get_num_effective_samples() * params.width*params.height;
}
}