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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2016-05-17 23:08:34 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2016-05-18 00:41:45 +0300
commit9dc5367c89f467e516620b6ff15e2eb35b26fdee (patch)
tree8bb96662721090de6d1efc84c6f4ae0d883d8fa6 /intern/cycles/bvh
parent2630207adae47181a7412786b9e18b428999228b (diff)
Cleanup code style inconsistency in last commits.
Diffstat (limited to 'intern/cycles/bvh')
-rw-r--r--intern/cycles/bvh/bvh_build.cpp2
-rw-r--r--intern/cycles/bvh/bvh_sort.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/bvh/bvh_build.cpp b/intern/cycles/bvh/bvh_build.cpp
index 6af4d25eefc..76a1bfa2bfe 100644
--- a/intern/cycles/bvh/bvh_build.cpp
+++ b/intern/cycles/bvh/bvh_build.cpp
@@ -631,7 +631,7 @@ BVHNode* BVHBuild::create_leaf_node(const BVHRange& range,
bounds[type_index].grow(ref.bounds());
visibility[type_index] |= objects[ref.prim_object()]->visibility;
- if (ref.prim_type() & PRIMITIVE_ALL_CURVE) {
+ if(ref.prim_type() & PRIMITIVE_ALL_CURVE) {
visibility[type_index] |= PATH_RAY_CURVE;
}
++num_new_prims;
diff --git a/intern/cycles/bvh/bvh_sort.cpp b/intern/cycles/bvh/bvh_sort.cpp
index f6bbdb231df..e9032c61c3b 100644
--- a/intern/cycles/bvh/bvh_sort.cpp
+++ b/intern/cycles/bvh/bvh_sort.cpp
@@ -125,7 +125,7 @@ static void bvh_reference_sort_threaded(TaskPool *task_pool,
if(compare.compare(data[left], data[right]) > 0) {
swap(data[left], data[right]);
}
- if (compare.compare(data[center], data[right]) > 0) {
+ if(compare.compare(data[center], data[right]) > 0) {
swap(data[center], data[right]);
}
swap(data[center], data[right - 1]);