diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-06-03 18:18:14 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-06-03 18:18:39 +0300 |
| commit | de9c04c28741ba907977674bf93f26d51a9d58a8 (patch) | |
| tree | cf80fe307f245ac3726ce65b8c3dc692e0426dd1 | |
| parent | 51cd6d22c5cce631739c398ade3e1d89406af317 (diff) | |
Cleanup: clang format, warning
| -rw-r--r-- | intern/cycles/kernel/closure/bsdf.h | 6 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/writefile.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/intern/cycles/kernel/closure/bsdf.h b/intern/cycles/kernel/closure/bsdf.h index a70a6bfbba1..4cc61e8ee71 100644 --- a/intern/cycles/kernel/closure/bsdf.h +++ b/intern/cycles/kernel/closure/bsdf.h @@ -458,7 +458,8 @@ ccl_device_inline int bsdf_sample(KernelGlobals *kg, } else { /* Shadow terminator offset. */ - const float frequency_multiplier = kernel_tex_fetch(__objects, sd->object).shadow_terminator_offset; + const float frequency_multiplier = + kernel_tex_fetch(__objects, sd->object).shadow_terminator_offset; if (frequency_multiplier > 1.0f) { *eval *= shift_cos_in(dot(*omega_in, sc->N), frequency_multiplier); } @@ -581,7 +582,8 @@ ccl_device_inline } } /* Shadow terminator offset. */ - const float frequency_multiplier = kernel_tex_fetch(__objects, sd->object).shadow_terminator_offset; + const float frequency_multiplier = + kernel_tex_fetch(__objects, sd->object).shadow_terminator_offset; if (frequency_multiplier > 1.0f) { eval *= shift_cos_in(dot(omega_in, sc->N), frequency_multiplier); } diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index f7dabcd71cc..ca46579099f 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -529,7 +529,7 @@ static void mywrite_id_begin(WriteData *wd, ID *id) * * Only does something when storing an undo step. */ -static void mywrite_id_end(WriteData *wd, ID *id) +static void mywrite_id_end(WriteData *wd, ID *UNUSED(id)) { if (wd->use_memfile) { /* Very important to do it after every ID write now, otherwise we cannot know whether a |