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
path: root/intern
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2020-01-15 05:46:25 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-01-15 05:46:25 +0300
commit41075589c0ffec141fcf83d4176bbd65c55367ed (patch)
tree094addde6bba1cc2e496d62dfb5a811d6eae6385 /intern
parent1ec08999b6a2200a1a54533fc9858b5d7dfc1364 (diff)
parentdedceb9395bb4383f7986540d6de551e4044640e (diff)
Merge branch 'blender-v2.82-release'
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/bvh/bvh_embree.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/bvh/bvh_embree.cpp b/intern/cycles/bvh/bvh_embree.cpp
index 42d2e66017c..ac7cf6501ba 100644
--- a/intern/cycles/bvh/bvh_embree.cpp
+++ b/intern/cycles/bvh/bvh_embree.cpp
@@ -190,10 +190,10 @@ static void rtc_filter_occluded_func(const RTCFilterFunctionNArguments *args)
}
else {
ctx->ss_isect->num_hits = 1;
- }
- /* record intersection */
- kernel_embree_convert_local_hit(
- kg, ray, hit, &ctx->ss_isect->hits[hit_idx], ctx->sss_object_id);
+ }
+ /* record intersection */
+ kernel_embree_convert_local_hit(
+ kg, ray, hit, &ctx->ss_isect->hits[hit_idx], ctx->sss_object_id);
ctx->ss_isect->Ng[hit_idx].x = hit->Ng_x;
ctx->ss_isect->Ng[hit_idx].y = hit->Ng_y;
ctx->ss_isect->Ng[hit_idx].z = hit->Ng_z;