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

Cycles: Cleanup, indentation

Browse Source
This commit is contained in:
Sergey Sharybin
2018-07-27 11:09:10 +02:00
parent b517b31085
commit 75c47542d7
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
intern/cycles/render/mesh.cpp
View File

@@ -2015,8 +2015,8 @@ void MeshManager::device_update_displacement_images(Device *device,
} }
void MeshManager::device_update_volume_images(Device *device, void MeshManager::device_update_volume_images(Device *device,
Scene *scene, Scene *scene,
Progress& progress) Progress& progress)
{ {
progress.set_status("Updating Volume Images"); progress.set_status("Updating Volume Images");
TaskPool pool; TaskPool pool;
@@ -2043,11 +2043,11 @@ void MeshManager::device_update_volume_images(Device *device,
foreach(int slot, volume_images) { foreach(int slot, volume_images) {
pool.push(function_bind(&ImageManager::device_update_slot, pool.push(function_bind(&ImageManager::device_update_slot,
image_manager, image_manager,
device, device,
scene, scene,
slot, slot,
&progress)); &progress));
} }
pool.wait_work(); pool.wait_work();
} }

4
intern/cycles/render/mesh.h
View File

@@ -381,8 +381,8 @@ protected:
Progress& progress); Progress& progress);
void device_update_volume_images(Device *device, void device_update_volume_images(Device *device,
Scene *scene, Scene *scene,
Progress& progress); Progress& progress);
}; };
CCL_NAMESPACE_END CCL_NAMESPACE_END