Skip to content

Commit 2479dd7

Browse files
committed
Undo formatting
1 parent d22a187 commit 2479dd7

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

src/kernel/bvh/bvh.h

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ ccl_device_intersect bool scene_intersect(KernelGlobals *kg,
226226

227227
return bvh_intersect_motion(kg, ray, isect, visibility);
228228
}
229-
# endif /* __OBJECT_MOTION__ */
229+
# endif /* __OBJECT_MOTION__ */
230230

231231
# ifdef __HAIR__
232232
if (kernel_data.bvh.have_curves) {
@@ -235,7 +235,7 @@ ccl_device_intersect bool scene_intersect(KernelGlobals *kg,
235235
# endif /* __HAIR__ */
236236

237237
return bvh_intersect(kg, ray, isect, visibility);
238-
#endif /* __KERNEL_OPTIX__ */
238+
#endif /* __KERNEL_OPTIX__ */
239239
}
240240

241241
#ifdef __BVH_LOCAL__
@@ -326,8 +326,7 @@ ccl_device_intersect bool scene_intersect_local(KernelGlobals *kg,
326326
rtc_ray.dir_x = dir.x;
327327
rtc_ray.dir_y = dir.y;
328328
rtc_ray.dir_z = dir.z;
329-
RTC_NAMESPACE::RTCScene scene = (RTC_NAMESPACE::RTCScene)
330-
RTC_NAMESPACE::rtcGetGeometryUserData(geom);
329+
RTC_NAMESPACE::RTCScene scene = (RTC_NAMESPACE::RTCScene)RTC_NAMESPACE::rtcGetGeometryUserData(geom);
331330
kernel_assert(scene);
332331
if (scene) {
333332
rtcOccluded1(scene, &rtc_ctx.context, &rtc_ray);
@@ -350,7 +349,7 @@ ccl_device_intersect bool scene_intersect_local(KernelGlobals *kg,
350349
}
351350
# endif /* __OBJECT_MOTION__ */
352351
return bvh_intersect_local(kg, ray, local_isect, local_object, lcg_state, max_hits);
353-
# endif /* __KERNEL_OPTIX__ */
352+
# endif /* __KERNEL_OPTIX__ */
354353
}
355354
#endif
356355

@@ -427,7 +426,7 @@ ccl_device_intersect bool scene_intersect_shadow_all(KernelGlobals *kg,
427426

428427
return bvh_intersect_shadow_all_motion(kg, ray, isect, visibility, max_hits, num_hits);
429428
}
430-
# endif /* __OBJECT_MOTION__ */
429+
# endif /* __OBJECT_MOTION__ */
431430

432431
# ifdef __HAIR__
433432
if (kernel_data.bvh.have_curves) {
@@ -436,7 +435,7 @@ ccl_device_intersect bool scene_intersect_shadow_all(KernelGlobals *kg,
436435
# endif /* __HAIR__ */
437436

438437
return bvh_intersect_shadow_all(kg, ray, isect, visibility, max_hits, num_hits);
439-
# endif /* __KERNEL_OPTIX__ */
438+
# endif /* __KERNEL_OPTIX__ */
440439
}
441440
#endif /* __SHADOW_RECORD_ALL__ */
442441

@@ -495,7 +494,7 @@ ccl_device_intersect bool scene_intersect_volume(KernelGlobals *kg,
495494
# endif /* __OBJECT_MOTION__ */
496495

497496
return bvh_intersect_volume(kg, ray, isect, visibility);
498-
# endif /* __KERNEL_OPTIX__ */
497+
# endif /* __KERNEL_OPTIX__ */
499498
}
500499
#endif /* __VOLUME__ */
501500

0 commit comments

Comments
 (0)