diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-05-05 06:29:28 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-05-05 06:29:28 +0400 |
commit | 620901426c3ad52585b933f83c4a02cfde67130a (patch) | |
tree | 936a509071a4fb125eabe1eec1f7b5a7435951bf | |
parent | 6d2c23bf70c550ead52a5e518d9e4846c5d3f23f (diff) |
Code cleanup
-rw-r--r-- | intern/cycles/kernel/geom/geom_bvh_shadow.h | 6 | ||||
-rw-r--r-- | intern/cycles/kernel/geom/geom_bvh_traversal.h | 6 | ||||
-rw-r--r-- | source/blender/editors/animation/anim_channels_defines.c | 2 |
3 files changed, 5 insertions, 9 deletions
diff --git a/intern/cycles/kernel/geom/geom_bvh_shadow.h b/intern/cycles/kernel/geom/geom_bvh_shadow.h index 42ecd4bc54b..98bf82b3b2d 100644 --- a/intern/cycles/kernel/geom/geom_bvh_shadow.h +++ b/intern/cycles/kernel/geom/geom_bvh_shadow.h @@ -83,11 +83,9 @@ ccl_device bool BVH_FUNCTION_NAME /* traversal loop */ do { - do - { + do { /* traverse internal nodes */ - while(nodeAddr >= 0 && nodeAddr != ENTRYPOINT_SENTINEL) - { + while(nodeAddr >= 0 && nodeAddr != ENTRYPOINT_SENTINEL) { bool traverseChild0, traverseChild1; int nodeAddrChild1; diff --git a/intern/cycles/kernel/geom/geom_bvh_traversal.h b/intern/cycles/kernel/geom/geom_bvh_traversal.h index e6da9391a46..9fd40f91471 100644 --- a/intern/cycles/kernel/geom/geom_bvh_traversal.h +++ b/intern/cycles/kernel/geom/geom_bvh_traversal.h @@ -87,11 +87,9 @@ ccl_device bool BVH_FUNCTION_NAME /* traversal loop */ do { - do - { + do { /* traverse internal nodes */ - while(nodeAddr >= 0 && nodeAddr != ENTRYPOINT_SENTINEL) - { + while(nodeAddr >= 0 && nodeAddr != ENTRYPOINT_SENTINEL) { bool traverseChild0, traverseChild1; int nodeAddrChild1; diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c index 746395cfe6f..62629949afe 100644 --- a/source/blender/editors/animation/anim_channels_defines.c +++ b/source/blender/editors/animation/anim_channels_defines.c @@ -2927,7 +2927,7 @@ static int acf_nlaaction_icon(bAnimListElem *ale) * Although this can't be used directly for NLA Action drawing, * it is still needed for use behind the RHS toggles */ -static void acf_nlaaction_color(bAnimContext *ac, bAnimListElem *ale, float r_color[3]) +static void acf_nlaaction_color(bAnimContext *UNUSED(ac), bAnimListElem *ale, float r_color[3]) { float color[4]; |