From d30ec73d763ed01795100ec5d3a0ef9dc8521f7b Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sat, 14 Sep 2019 08:05:57 +1000
Subject: Cleanup: undeclared variable warnings, extra semicolon

---
 source/blender/editors/sculpt_paint/sculpt.c  | 15 ++++++++-------
 source/blender/makesdna/intern/dna_defaults.c |  4 +---
 source/blender/makesrna/intern/rna_mesh.c     |  2 +-
 3 files changed, 10 insertions(+), 11 deletions(-)

(limited to 'source')

diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index b0c4bcdef0e..fd45d1a17bc 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -332,7 +332,8 @@ static void sculpt_vertex_neighbors_get(SculptSession *ss,
   } \
   if (neighbor_iterator.neighbors != neighbor_iterator.neighbors_fixed) { \
     MEM_freeN(neighbor_iterator.neighbors); \
-  }
+  } \
+  ((void)0)
 
 /* Utils */
 static void sculpt_vertex_mask_clamp(SculptSession *ss, int index, float min, float max)
@@ -1211,7 +1212,7 @@ static float *sculpt_topology_automasking_init(Sculpt *sd, Object *ob, float *au
         }
       }
     }
-    sculpt_vertex_neighbors_iter_end(ni)
+    sculpt_vertex_neighbors_iter_end(ni);
   }
 
   BLI_stack_free(not_visited_vertices);
@@ -3676,7 +3677,7 @@ static void sculpt_pose_brush_init(Sculpt *sd, Object *ob, SculptSession *ss, Br
         }
       }
     }
-    sculpt_vertex_neighbors_iter_end(ni)
+    sculpt_vertex_neighbors_iter_end(ni);
   }
 
   BLI_stack_free(not_visited_vertices);
@@ -8217,7 +8218,7 @@ typedef enum eSculptMaskFilterTypes {
   MASK_FILTER_CONTRAST_DECREASE = 6,
 } eSculptMaskFilterTypes;
 
-EnumPropertyItem prop_mask_filter_types[] = {
+static EnumPropertyItem prop_mask_filter_types[] = {
     {MASK_FILTER_SMOOTH, "SMOOTH", 0, "Smooth Mask", "Smooth mask"},
     {MASK_FILTER_SHARPEN, "SHARPEN", 0, "Sharpen Mask", "Sharpen mask"},
     {MASK_FILTER_GROW, "GROW", 0, "Grow Mask", "Grow mask"},
@@ -8945,7 +8946,7 @@ static int sculpt_mask_expand_invoke(bContext *C, wmOperator *op, const wmEvent
         BLI_gsqueue_push(queue, &new_entry);
       }
     }
-    sculpt_vertex_neighbors_iter_end(ni)
+    sculpt_vertex_neighbors_iter_end(ni);
   }
 
   if (use_normals) {
@@ -9096,7 +9097,7 @@ void sculpt_geometry_preview_lines_update(bContext *C, SculptSession *ss, float
         }
       }
     }
-    sculpt_vertex_neighbors_iter_end(ni)
+    sculpt_vertex_neighbors_iter_end(ni);
   }
 
   BLI_stack_free(not_visited_vertices);
@@ -9327,7 +9328,7 @@ typedef enum eSculptPivotPositionModes {
   SCULPT_PIVOT_POSITION_CURSOR_SURFACE = 4,
 } eSculptPivotPositionModes;
 
-EnumPropertyItem prop_sculpt_pivot_position_types[] = {
+static EnumPropertyItem prop_sculpt_pivot_position_types[] = {
     {SCULPT_PIVOT_POSITION_ORIGIN,
      "ORIGIN",
      0,
diff --git a/source/blender/makesdna/intern/dna_defaults.c b/source/blender/makesdna/intern/dna_defaults.c
index bae0df7e1e6..76d076a8638 100644
--- a/source/blender/makesdna/intern/dna_defaults.c
+++ b/source/blender/makesdna/intern/dna_defaults.c
@@ -93,7 +93,7 @@
 #include "DNA_world_defaults.h"
 
 #define SDNA_DEFAULT_DECL_STRUCT(struct_name) \
-  const struct_name DNA_DEFAULT_##struct_name = _DNA_DEFAULT_##struct_name
+  static const struct_name DNA_DEFAULT_##struct_name = _DNA_DEFAULT_##struct_name
 
 /* DNA_brush_defaults.h */
 SDNA_DEFAULT_DECL_STRUCT(Brush);
@@ -103,8 +103,6 @@ SDNA_DEFAULT_DECL_STRUCT(CacheFile);
 
 /* DNA_camera_defaults.h */
 SDNA_DEFAULT_DECL_STRUCT(Camera);
-SDNA_DEFAULT_DECL_STRUCT(CameraDOFSettings);
-SDNA_DEFAULT_DECL_STRUCT(CameraStereoSettings);
 
 /* DNA_curve_defaults.h */
 SDNA_DEFAULT_DECL_STRUCT(Curve);
diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c
index 1edf6a6b780..24f22061c61 100644
--- a/source/blender/makesrna/intern/rna_mesh.c
+++ b/source/blender/makesrna/intern/rna_mesh.c
@@ -55,7 +55,7 @@ const EnumPropertyItem rna_enum_mesh_delimit_mode_items[] = {
     {0, NULL, 0, NULL, NULL},
 };
 
-const EnumPropertyItem rna_enum_mesh_remesh_mode_items[] = {
+static const EnumPropertyItem rna_enum_mesh_remesh_mode_items[] = {
     {REMESH_VOXEL, "VOXEL", 0, "Voxel", "Use the voxel remesher"},
     {REMESH_QUAD, "QUAD", 0, "Quad", "Use the quad remesher"},
     {0, NULL, 0, NULL, NULL},
-- 
cgit v1.2.3