diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2014-08-15 17:44:50 +0400 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2014-08-15 17:44:50 +0400 |
commit | 9a29b0f15531f359f36e3efd50232e35b90ba593 (patch) | |
tree | 76b4ab5742c364607cfbb03b1156f03145ee9fde | |
parent | 968e1b3b10c7fb8c99d18e0ebcbffb5453d165af (diff) |
Fix compilation on linux (implicit conversion from double/float to size_t treated as error here).
-rw-r--r-- | intern/cycles/render/bake.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/render/bake.cpp b/intern/cycles/render/bake.cpp index caf72089d68..ac0fb817ba5 100644 --- a/intern/cycles/render/bake.cpp +++ b/intern/cycles/render/bake.cpp @@ -123,7 +123,7 @@ BakeData *BakeManager::init(const int object, const size_t tri_offset, const siz void BakeManager::set_shader_limit(const size_t x, const size_t y) { m_shader_limit = x * y; - m_shader_limit = pow(2, ceil(log(m_shader_limit)/log(2))); + m_shader_limit = (size_t)pow(2, ceil(log(m_shader_limit)/log(2))); } bool BakeManager::bake(Device *device, DeviceScene *dscene, Scene *scene, Progress& progress, ShaderEvalType shader_type, BakeData *bake_data, float result[]) @@ -135,7 +135,7 @@ bool BakeManager::bake(Device *device, DeviceScene *dscene, Scene *scene, Progre /* calculate the total parts for the progress bar */ for(size_t shader_offset = 0; shader_offset < num_pixels; shader_offset += m_shader_limit) { - size_t shader_size = fminf(num_pixels - shader_offset, m_shader_limit); + size_t shader_size = (size_t)fminf(num_pixels - shader_offset, m_shader_limit); DeviceTask task(DeviceTask::SHADER); task.shader_w = shader_size; @@ -146,7 +146,7 @@ bool BakeManager::bake(Device *device, DeviceScene *dscene, Scene *scene, Progre this->num_samples = is_aa_pass(shader_type)? scene->integrator->aa_samples : 1; for(size_t shader_offset = 0; shader_offset < num_pixels; shader_offset += m_shader_limit) { - size_t shader_size = fminf(num_pixels - shader_offset, m_shader_limit); + size_t shader_size = (size_t)fminf(num_pixels - shader_offset, m_shader_limit); /* setup input for device task */ device_vector<uint4> d_input; |