diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-22 20:51:59 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-25 00:50:49 +0300 |
| commit | a888b8beaf7605bad36926cbe26f0828620a4004 (patch) | |
| tree | 4a9cefb3437e26de36d380e5a97062737d7626e8 | |
| parent | 144096faad21626b98133da3a837ff5aa5af4e35 (diff) | |
Cycles; Code cleanup, make it more obvious what #endif belongs to
| -rw-r--r-- | intern/cycles/kernel/geom/geom_bvh_shadow.h | 4 | ||||
| -rw-r--r-- | intern/cycles/kernel/geom/geom_bvh_subsurface.h | 4 | ||||
| -rw-r--r-- | intern/cycles/kernel/geom/geom_bvh_traversal.h | 4 | ||||
| -rw-r--r-- | intern/cycles/kernel/geom/geom_bvh_volume.h | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/intern/cycles/kernel/geom/geom_bvh_shadow.h b/intern/cycles/kernel/geom/geom_bvh_shadow.h index 0732869aea9..9704b0ac1b8 100644 --- a/intern/cycles/kernel/geom/geom_bvh_shadow.h +++ b/intern/cycles/kernel/geom/geom_bvh_shadow.h @@ -314,7 +314,7 @@ ccl_device bool BVH_FUNCTION_NAME nodeAddr = kernel_tex_fetch(__object_node, object); } } -#endif +#endif /* FEATURE(BVH_INSTANCING) */ } while(nodeAddr != ENTRYPOINT_SENTINEL); #if FEATURE(BVH_INSTANCING) @@ -360,7 +360,7 @@ ccl_device bool BVH_FUNCTION_NAME nodeAddr = traversalStack[stackPtr]; --stackPtr; } -#endif +#endif /* FEATURE(BVH_INSTANCING) */ } while(nodeAddr != ENTRYPOINT_SENTINEL); return false; diff --git a/intern/cycles/kernel/geom/geom_bvh_subsurface.h b/intern/cycles/kernel/geom/geom_bvh_subsurface.h index d8ca51a096b..e5cb60f537a 100644 --- a/intern/cycles/kernel/geom/geom_bvh_subsurface.h +++ b/intern/cycles/kernel/geom/geom_bvh_subsurface.h @@ -251,7 +251,7 @@ ccl_device uint BVH_FUNCTION_NAME(KernelGlobals *kg, const Ray *ray, Intersectio } } } -#endif +#endif /* FEATURE(BVH_INSTANCING) */ } while(nodeAddr != ENTRYPOINT_SENTINEL); #if FEATURE(BVH_INSTANCING) @@ -279,7 +279,7 @@ ccl_device uint BVH_FUNCTION_NAME(KernelGlobals *kg, const Ray *ray, Intersectio nodeAddr = traversalStack[stackPtr]; --stackPtr; } -#endif +#endif /* FEATURE(BVH_INSTANCING) */ } while(nodeAddr != ENTRYPOINT_SENTINEL); return num_hits; diff --git a/intern/cycles/kernel/geom/geom_bvh_traversal.h b/intern/cycles/kernel/geom/geom_bvh_traversal.h index 5c3b720794e..1d053ba5d08 100644 --- a/intern/cycles/kernel/geom/geom_bvh_traversal.h +++ b/intern/cycles/kernel/geom/geom_bvh_traversal.h @@ -329,7 +329,7 @@ ccl_device bool BVH_FUNCTION_NAME nodeAddr = kernel_tex_fetch(__object_node, object); } } -#endif +#endif /* FEATURE(BVH_INSTANCING) */ } while(nodeAddr != ENTRYPOINT_SENTINEL); #if FEATURE(BVH_INSTANCING) @@ -357,7 +357,7 @@ ccl_device bool BVH_FUNCTION_NAME nodeAddr = traversalStack[stackPtr]; --stackPtr; } -#endif +#endif /* FEATURE(BVH_INSTANCING) */ } while(nodeAddr != ENTRYPOINT_SENTINEL); return (isect->prim != PRIM_NONE); diff --git a/intern/cycles/kernel/geom/geom_bvh_volume.h b/intern/cycles/kernel/geom/geom_bvh_volume.h index 341c9161c43..58dda7b5e06 100644 --- a/intern/cycles/kernel/geom/geom_bvh_volume.h +++ b/intern/cycles/kernel/geom/geom_bvh_volume.h @@ -271,7 +271,7 @@ ccl_device bool BVH_FUNCTION_NAME(KernelGlobals *kg, } } } -#endif +#endif /* FEATURE(BVH_INSTANCING) */ } while(nodeAddr != ENTRYPOINT_SENTINEL); #if FEATURE(BVH_INSTANCING) @@ -299,7 +299,7 @@ ccl_device bool BVH_FUNCTION_NAME(KernelGlobals *kg, nodeAddr = traversalStack[stackPtr]; --stackPtr; } -#endif +#endif /* FEATURE(BVH_MOTION) */ } while(nodeAddr != ENTRYPOINT_SENTINEL); return (isect->prim != PRIM_NONE); |