[Bf-blender-cvs] [ddda73b98a9] master: Cleanup: warnings, clang-format

[Campbell Barton]

Commit: ddda73b98a9c0a45e4fec667ba4021cec456d030
Author: Campbell Barton
Date:   Tue Jan 28 11:42:24 2020 +1100
Branches: master
https://developer.blender.org/rBddda73b98a9c0a45e4fec667ba4021cec456d030

Cleanup: warnings, clang-format

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

M	source/blender/bmesh/tools/bmesh_intersect_edges.c
M	source/blender/collada/collada_utils.cpp
M	source/blender/editors/space_view3d/view3d_gizmo_navigate_type.c
M	source/blender/modifiers/intern/MOD_dynamicpaint.c

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

diff --git a/source/blender/bmesh/tools/bmesh_intersect_edges.c b/source/blender/bmesh/tools/bmesh_intersect_edges.c
index 4e3f525f760..ce40256221e 100644
--- a/source/blender/bmesh/tools/bmesh_intersect_edges.c
+++ b/source/blender/bmesh/tools/bmesh_intersect_edges.c
@@ -805,7 +805,7 @@ bool BM_mesh_intersect_edges(
           e = pair_elem->edge;
           if (split_faces) {
             /* Tagged edges are ignored when split faces.
-            /* Untag these. */
+             * Un-tag these. */
             BM_elem_flag_disable(e, BM_ELEM_TAG);
           }
 
diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp
index 5db4609c7c2..63dad6b7ac0 100644
--- a/source/blender/collada/collada_utils.cpp
+++ b/source/blender/collada/collada_utils.cpp
@@ -1322,7 +1322,8 @@ void bc_add_default_shader(bContext *C, Material *ma)
 
 COLLADASW::ColorOrTexture bc_get_base_color(Material *ma)
 {
-  Color default_color = {ma->r, ma->g, ma->b, 1.0}; // for alpha see bc_get_alpha()
+  /* for alpha see bc_get_alpha() */
+  Color default_color = {ma->r, ma->g, ma->b, 1.0};
   bNode *shader = bc_get_master_shader(ma);
   if (ma->use_nodes && shader) {
     return bc_get_cot_from_shader(shader, "Base Color", default_color, false);
diff --git a/source/blender/editors/space_view3d/view3d_gizmo_navigate_type.c b/source/blender/editors/space_view3d/view3d_gizmo_navigate_type.c
index c8b85cd98db..75ab6518a4f 100644
--- a/source/blender/editors/space_view3d/view3d_gizmo_navigate_type.c
+++ b/source/blender/editors/space_view3d/view3d_gizmo_navigate_type.c
@@ -515,7 +515,7 @@ static int gizmo_axis_test_select(bContext *UNUSED(C), wmGizmo *gz, const int mv
   return -1;
 }
 
-static int gizmo_axis_cursor_get(wmGizmo *gz)
+static int gizmo_axis_cursor_get(wmGizmo *UNUSED(gz))
 {
   return WM_CURSOR_DEFAULT;
 }
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,