blender
/
blender
131
398
Fork 577
Code Issues 6.2k Pull Requests 744 Projects 19 Wiki Activity

Cycles; Code cleanup, make it more obvious what #endif belongs to

This commit is contained in:
Sergey Sharybin 2014-12-22 22:51:59 +05:00
parent 144096faad
commit a888b8beaf
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/kernel/geom/geom_bvh_shadow.h
View File

@ -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;

4
intern/cycles/kernel/geom/geom_bvh_subsurface.h
View File

@ -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;

4
intern/cycles/kernel/geom/geom_bvh_traversal.h
View File

@ -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);

4
intern/cycles/kernel/geom/geom_bvh_volume.h
View File

@ -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);