[Bf-blender-cvs] [de9c04c2874] master: Cleanup: clang format, warning

[Campbell Barton]

Commit: de9c04c28741ba907977674bf93f26d51a9d58a8
Author: Campbell Barton
Date:   Thu Jun 4 01:18:14 2020 +1000
Branches: master
https://developer.blender.org/rBde9c04c28741ba907977674bf93f26d51a9d58a8

Cleanup: clang format, warning

===================================================================

M	intern/cycles/kernel/closure/bsdf.h
M	source/blender/blenloader/intern/writefile.c

===================================================================

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