[Bf-blender-cvs] [0dbbb2eabf7] master: Cleanup: compiler warnings

Brecht Van Lommel noreply at git.blender.org
Sat Mar 21 14:45:54 CET 2020


Commit: 0dbbb2eabf7b8ee436dc806ce441f00e48d46f6f
Author: Brecht Van Lommel
Date:   Sat Mar 21 14:40:51 2020 +0100
Branches: master
https://developer.blender.org/rB0dbbb2eabf7b8ee436dc806ce441f00e48d46f6f

Cleanup: compiler warnings

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

M	source/blender/blenkernel/intern/gpencil_geom.c
M	source/blender/blenkernel/intern/multires_reshape_smooth.c
M	source/blender/blenkernel/intern/volume.cc

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

diff --git a/source/blender/blenkernel/intern/gpencil_geom.c b/source/blender/blenkernel/intern/gpencil_geom.c
index 92054c5c79a..c4acc871752 100644
--- a/source/blender/blenkernel/intern/gpencil_geom.c
+++ b/source/blender/blenkernel/intern/gpencil_geom.c
@@ -51,8 +51,6 @@
 
 #include "DEG_depsgraph_query.h"
 
-static CLG_LogRef LOG = {"bke_geom.gpencil"};
-
 /* GP Object - Boundbox Support */
 /**
  * Get min/max coordinate bounds for single stroke
diff --git a/source/blender/blenkernel/intern/multires_reshape_smooth.c b/source/blender/blenkernel/intern/multires_reshape_smooth.c
index 23370186af6..8b10d729901 100644
--- a/source/blender/blenkernel/intern/multires_reshape_smooth.c
+++ b/source/blender/blenkernel/intern/multires_reshape_smooth.c
@@ -659,12 +659,12 @@ static void foreach_vertex_of_loose_edge(const struct SubdivForeachContext *fore
   }
 }
 
-void foreach_edge(const struct SubdivForeachContext *foreach_context,
-                  void *tls,
-                  const int coarse_edge_index,
-                  const int UNUSED(subdiv_edge_index),
-                  const int subdiv_v1,
-                  const int subdiv_v2)
+static void foreach_edge(const struct SubdivForeachContext *foreach_context,
+                         void *UNUSED(tls),
+                         const int coarse_edge_index,
+                         const int UNUSED(subdiv_edge_index),
+                         const int subdiv_v1,
+                         const int subdiv_v2)
 {
   MultiresReshapeSmoothContext *reshape_smooth_context = foreach_context->user_data;
   const MultiresReshapeContext *reshape_context = reshape_smooth_context->reshape_context;
diff --git a/source/blender/blenkernel/intern/volume.cc b/source/blender/blenkernel/intern/volume.cc
index 03bbf308802..64d985ab7ec 100644
--- a/source/blender/blenkernel/intern/volume.cc
+++ b/source/blender/blenkernel/intern/volume.cc
@@ -52,7 +52,9 @@
 
 #include "CLG_log.h"
 
+#ifdef WITH_OPENVDB
 static CLG_LogRef LOG = {"bke.volume"};
+#endif
 
 #define VOLUME_FRAME_NONE INT_MAX
 
@@ -590,6 +592,7 @@ static int volume_sequence_frame(const Depsgraph *depsgraph, const Volume *volum
   return frame;
 }
 
+#ifdef WITH_OPENVDB
 static void volume_filepath_get(const Main *bmain, const Volume *volume, char r_filepath[FILE_MAX])
 {
   BLI_strncpy(r_filepath, volume->filepath, FILE_MAX);
@@ -603,6 +606,7 @@ static void volume_filepath_get(const Main *bmain, const Volume *volume, char r_
     BLI_path_extension_ensure(r_filepath, FILE_MAX, ext);
   }
 }
+#endif
 
 /* File Load */



More information about the Bf-blender-cvs mailing list