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:22:14 +0300
commitc727bc7743442609cecf52644d6e235e0f82493b (patch)
tree08d3d752cadf35c4eb32d8a314417834727fa26b /intern/cycles
parentfeb2f0ae3041d27cba9a8aaadaf31bfcbab67ff2 (diff)
Fix T50517: Rendering expecting time is negative
Diffstat (limited to 'intern/cycles')
-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;
}
}