[Bf-blender-cvs] [75c47542d78] master: Cycles: Cleanup, indentation
Sergey Sharybin
noreply at git.blender.org
Fri Jul 27 11:09:22 CEST 2018
Commit: 75c47542d787c91293572b007bbf6787f903522a
Author: Sergey Sharybin
Date: Fri Jul 27 11:09:10 2018 +0200
Branches: master
https://developer.blender.org/rB75c47542d787c91293572b007bbf6787f903522a
Cycles: Cleanup, indentation
===================================================================
M intern/cycles/render/mesh.cpp
M intern/cycles/render/mesh.h
===================================================================
diff --git a/intern/cycles/render/mesh.cpp b/intern/cycles/render/mesh.cpp
index 7a9d604244d..df408b478b2 100644
--- a/intern/cycles/render/mesh.cpp
+++ b/intern/cycles/render/mesh.cpp
@@ -2015,8 +2015,8 @@ void MeshManager::device_update_displacement_images(Device *device,
}
void MeshManager::device_update_volume_images(Device *device,
- Scene *scene,
- Progress& progress)
+ Scene *scene,
+ Progress& progress)
{
progress.set_status("Updating Volume Images");
TaskPool pool;
@@ -2043,11 +2043,11 @@ void MeshManager::device_update_volume_images(Device *device,
foreach(int slot, volume_images) {
pool.push(function_bind(&ImageManager::device_update_slot,
- image_manager,
- device,
- scene,
- slot,
- &progress));
+ image_manager,
+ device,
+ scene,
+ slot,
+ &progress));
}
pool.wait_work();
}
diff --git a/intern/cycles/render/mesh.h b/intern/cycles/render/mesh.h
index e7dc1c8e5cf..fc7d0b40273 100644
--- a/intern/cycles/render/mesh.h
+++ b/intern/cycles/render/mesh.h
@@ -381,8 +381,8 @@ protected:
Progress& progress);
void device_update_volume_images(Device *device,
- Scene *scene,
- Progress& progress);
+ Scene *scene,
+ Progress& progress);
};
CCL_NAMESPACE_END
More information about the Bf-blender-cvs
mailing list