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>2015-02-19 17:05:04 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-02-19 17:05:04 +0300
commit7f406a53c7190917a7985c75fbb6b606dd2f97a2 (patch)
treec7a3f44eba82f41a756a8a7170b109fe99944d55 /intern/cycles/device
parent3bc9ac19f5086fa615ee1b109be36bae9bb855f6 (diff)
Cycles: Cleanup for indentation in device_cpu.cpp
Perhaps became broken after rather recent change about which entry point to kernel to use.
Diffstat (limited to 'intern/cycles/device')
-rw-r--r--intern/cycles/device/device_cpu.cpp27
1 files changed, 13 insertions, 14 deletions
diff --git a/intern/cycles/device/device_cpu.cpp b/intern/cycles/device/device_cpu.cpp
index a993a5810f5..9abcf9167d5 100644
--- a/intern/cycles/device/device_cpu.cpp
+++ b/intern/cycles/device/device_cpu.cpp
@@ -206,24 +206,23 @@ public:
int start_sample = tile.start_sample;
int end_sample = tile.start_sample + tile.num_samples;
- for(int sample = start_sample; sample < end_sample; sample++) {
- if (task.get_cancel() || task_pool.canceled()) {
- if(task.need_finish_queue == false)
- break;
- }
+ for(int sample = start_sample; sample < end_sample; sample++) {
+ if (task.get_cancel() || task_pool.canceled()) {
+ if(task.need_finish_queue == false)
+ break;
+ }
- for(int y = tile.y; y < tile.y + tile.h; y++) {
- for(int x = tile.x; x < tile.x + tile.w; x++) {
- path_trace_kernel(&kg, render_buffer, rng_state,
- sample, x, y, tile.offset, tile.stride);
- }
+ for(int y = tile.y; y < tile.y + tile.h; y++) {
+ for(int x = tile.x; x < tile.x + tile.w; x++) {
+ path_trace_kernel(&kg, render_buffer, rng_state,
+ sample, x, y, tile.offset, tile.stride);
}
-
- tile.sample = sample + 1;
-
- task.update_progress(&tile);
}
+ tile.sample = sample + 1;
+
+ task.update_progress(&tile);
+ }
task.release_tile(tile);