From 0dbbb2eabf7b8ee436dc806ce441f00e48d46f6f Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Sat, 21 Mar 2020 14:40:51 +0100 Subject: Cleanup: compiler warnings --- source/blender/blenkernel/intern/gpencil_geom.c | 2 -- source/blender/blenkernel/intern/multires_reshape_smooth.c | 12 ++++++------ source/blender/blenkernel/intern/volume.cc | 4 ++++ 3 files changed, 10 insertions(+), 8 deletions(-) (limited to 'source/blender/blenkernel/intern') 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 */ -- cgit v1.2.3