[Bf-blender-cvs] [7a27f64ecb5] blender-v2.82-release: Cleanup: clang-format, unused variable

[Campbell Barton]

Commit: 7a27f64ecb5ac4c6cac3a27436d7b25037e62054
Author: Campbell Barton
Date:   Thu Jan 30 13:28:17 2020 +1100
Branches: blender-v2.82-release
https://developer.blender.org/rB7a27f64ecb5ac4c6cac3a27436d7b25037e62054

Cleanup: clang-format, unused variable

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

M	intern/cycles/render/shader.cpp
M	source/blender/blenkernel/intern/displist_tangent.c
M	source/blender/editors/screen/area.c
M	source/blender/modifiers/intern/MOD_dynamicpaint.c

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

diff --git a/intern/cycles/render/shader.cpp b/intern/cycles/render/shader.cpp
index da04ef63295..661208c6463 100644
--- a/intern/cycles/render/shader.cpp
+++ b/intern/cycles/render/shader.cpp
@@ -317,7 +317,8 @@ void Shader::tag_update(Scene *scene)
    * has use_mis set to false. We are quite close to release now, so
    * better to be safe.
    */
-  if (this == scene->background->get_shader(scene) && scene->light_manager->has_background_light(scene)) {
+  if (this == scene->background->get_shader(scene) &&
+      scene->light_manager->has_background_light(scene)) {
     scene->light_manager->need_update = true;
   }
 
diff --git a/source/blender/blenkernel/intern/displist_tangent.c b/source/blender/blenkernel/intern/displist_tangent.c
index 56041f09767..754aa78c0ac 100644
--- a/source/blender/blenkernel/intern/displist_tangent.c
+++ b/source/blender/blenkernel/intern/displist_tangent.c
@@ -128,11 +128,12 @@ void BKE_displist_tangent_calc(const DispList *dl, float (*fnormals)[3], float (
     genTangSpaceDefault(&sContext);
   }
   else if (dl->type == DL_SURF) {
+#if 0
     int vert_len = dl->parts * dl->nr;
     if (*r_tangent == NULL) {
-      //   *r_tangent = MEM_mallocN(sizeof(float[4]) * vert_len, "displist tangents");
+        *r_tangent = MEM_mallocN(sizeof(float[4]) * vert_len, "displist tangents");
     }
-
+#endif
     /* TODO */
     BLI_assert(0);
   }
diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c
index 29626fb6a8f..ef201603b30 100644
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.c
@@ -2902,7 +2902,7 @@ void ED_region_info_draw(ARegion *ar,
                          float fill_color[4],
                          const bool full_redraw)
 {
-  ED_region_info_draw_multiline(ar, (const char * [2]){text, NULL}, fill_color, full_redraw);
+  ED_region_info_draw_multiline(ar, (const char *[2]){text, NULL}, fill_color, full_redraw);
 }
 
 #define MAX_METADATA_STR 1024
diff --git a/source/blender/modifiers/intern/MOD_dynamicpaint.c b/source/blender/modifiers/intern/MOD_dynamicpaint.c
index 19444a3d363..83d8439f046 100644
--- a/source/blender/modifiers/intern/MOD_dynamicpaint.c
+++ b/source/blender/modifiers/intern/MOD_dynamicpaint.c
@@ -177,8 +177,7 @@ ModifierTypeInfo modifierType_DynamicPaint = {
     /* structName */ "DynamicPaintModifierData",
     /* structSize */ sizeof(DynamicPaintModifierData),
     /* type */ eModifierTypeType_Constructive,
-    /* flags */ eModifierTypeFlag_AcceptsMesh |
-        eModifierTypeFlag_SupportsMapping |
+    /* flags */ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsMapping |
         eModifierTypeFlag_UsesPointCache | eModifierTypeFlag_Single |
         eModifierTypeFlag_UsesPreview,