Commit: 7f406a53c7190917a7985c75fbb6b606dd2f97a2
Author: Sergey Sharybin
Date: Thu Feb 19 19:05:04 2015 +0500
Branches: master
https://developer.blender.org/rB7f406a53c7190917a7985c75fbb6b606dd2f97a2
Cycles: Cleanup for indentation in device_cpu.cpp
Perhaps became broken after rather recent change about which entry point
to kernel to use.
===================================================================
M intern/cycles/device/device_cpu.cpp
===================================================================
diff --git a/intern/cycles/device/device_cpu.cpp
b/intern/cycles/device/device_cpu.cpp
index a993a58..9abcf91 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);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
