Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix compilation on linux (implicit conversion from double/float to size_t treated as error here).

Browse Source
This commit is contained in:
Bastien Montagne
2014-08-15 15:44:50 +02:00
parent 968e1b3b10
commit 9a29b0f155
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
intern/cycles/render/bake.cpp
View File

@@ -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) void BakeManager::set_shader_limit(const size_t x, const size_t y)
{ {
m_shader_limit = x * 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[]) 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 */ /* calculate the total parts for the progress bar */
for(size_t shader_offset = 0; shader_offset < num_pixels; shader_offset += m_shader_limit) { 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); DeviceTask task(DeviceTask::SHADER);
task.shader_w = shader_size; 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; 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) { 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 */ /* setup input for device task */
device_vector<uint4> d_input; device_vector<uint4> d_input;