[Bf-blender-cvs] [6ba5966] master: Cycles: Cleanup, sync some comments across different traversal
Sergey Sharybin
noreply at git.blender.org
Mon Sep 19 15:38:19 CEST 2016
Commit: 6ba59660fbb3d98d78c8166525d33bb85ddd70f8
Author: Sergey Sharybin
Date: Mon Sep 19 15:01:30 2016 +0200
Branches: master
https://developer.blender.org/rB6ba59660fbb3d98d78c8166525d33bb85ddd70f8
Cycles: Cleanup, sync some comments across different traversal
===================================================================
M intern/cycles/kernel/bvh/bvh_shadow_all.h
M intern/cycles/kernel/bvh/bvh_volume_all.h
M intern/cycles/kernel/bvh/qbvh_shadow_all.h
===================================================================
diff --git a/intern/cycles/kernel/bvh/bvh_shadow_all.h b/intern/cycles/kernel/bvh/bvh_shadow_all.h
index 0c0a877..f3dc5cf 100644
--- a/intern/cycles/kernel/bvh/bvh_shadow_all.h
+++ b/intern/cycles/kernel/bvh/bvh_shadow_all.h
@@ -343,6 +343,7 @@ bool BVH_FUNCTION_FULL_NAME(BVH)(KernelGlobals *kg,
if(stack_ptr >= 0) {
kernel_assert(object != OBJECT_NONE);
+ /* Instance pop. */
if(num_hits_in_instance) {
float t_fac;
diff --git a/intern/cycles/kernel/bvh/bvh_volume_all.h b/intern/cycles/kernel/bvh/bvh_volume_all.h
index 1f6515c..67b2562 100644
--- a/intern/cycles/kernel/bvh/bvh_volume_all.h
+++ b/intern/cycles/kernel/bvh/bvh_volume_all.h
@@ -334,6 +334,7 @@ uint BVH_FUNCTION_FULL_NAME(BVH)(KernelGlobals *kg,
if(stack_ptr >= 0) {
kernel_assert(object != OBJECT_NONE);
+ /* Instance pop. */
if(num_hits_in_instance) {
float t_fac;
# if BVH_FEATURE(BVH_MOTION)
diff --git a/intern/cycles/kernel/bvh/qbvh_shadow_all.h b/intern/cycles/kernel/bvh/qbvh_shadow_all.h
index 73dd18a..03c678b 100644
--- a/intern/cycles/kernel/bvh/qbvh_shadow_all.h
+++ b/intern/cycles/kernel/bvh/qbvh_shadow_all.h
@@ -427,6 +427,7 @@ ccl_device bool BVH_FUNCTION_FULL_NAME(QBVH)(KernelGlobals *kg,
if(stack_ptr >= 0) {
kernel_assert(object != OBJECT_NONE);
+ /* Instance pop. */
if(num_hits_in_instance) {
float t_fac;
More information about the Bf-blender-cvs
mailing list