[Bf-blender-cvs] [f9f0f44be85] master: Cleanup: quiet discarded-qualifiers, unused warnings

[Campbell Barton]

Commit: f9f0f44be85d4631afbbf9b248dc7787dd41255f
Author: Campbell Barton
Date:   Wed Apr 1 10:41:34 2020 +1100
Branches: master
https://developer.blender.org/rBf9f0f44be85d4631afbbf9b248dc7787dd41255f

Cleanup: quiet discarded-qualifiers, unused warnings

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

M	source/blender/blenkernel/intern/subdiv_ccg.c
M	source/blender/editors/object/object_remesh.c
M	source/blender/gpu/intern/gpu_buffers.c

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

diff --git a/source/blender/blenkernel/intern/subdiv_ccg.c b/source/blender/blenkernel/intern/subdiv_ccg.c
index dff7170e517..bdb2a1c5686 100644
--- a/source/blender/blenkernel/intern/subdiv_ccg.c
+++ b/source/blender/blenkernel/intern/subdiv_ccg.c
@@ -1783,11 +1783,11 @@ void BKE_subdiv_ccg_neighbor_coords_get(const SubdivCCG *subdiv_ccg,
 
 int BKE_subdiv_cgg_grid_to_face_index(const SubdivCCG *subdiv_ccg, const int grid_index)
 {
-  Subdiv *subdiv = subdiv_ccg->subdiv;
-  OpenSubdiv_TopologyRefiner *topology_refiner = subdiv->topology_refiner;
+  // Subdiv *subdiv = subdiv_ccg->subdiv; /* UNUSED */
+  // OpenSubdiv_TopologyRefiner *topology_refiner = subdiv->topology_refiner; /* UNUSED */
   SubdivCCGFace *face = subdiv_ccg->grid_faces[grid_index];
 
-  const int face_grid_index = grid_index - face->start_grid_index;
+  // const int face_grid_index = grid_index - face->start_grid_index; /* UNUSED */
   const int face_index = face - subdiv_ccg->faces;
   return face_index;
 }
diff --git a/source/blender/editors/object/object_remesh.c b/source/blender/editors/object/object_remesh.c
index 08c44b87664..99e9f3034c9 100644
--- a/source/blender/editors/object/object_remesh.c
+++ b/source/blender/editors/object/object_remesh.c
@@ -320,7 +320,7 @@ static void voxel_size_edit_draw(const bContext *UNUSED(C), ARegion *UNUSED(ar),
       pos3d, cd->preview_plane[1], cd->preview_plane[2], cd->preview_plane[0], cd->voxel_size);
 
   /* Draw text */
-  uiStyle *style = UI_style_get();
+  const uiStyle *style = UI_style_get();
   const uiFontStyle *fstyle = &style->widget;
   const int fontid = fstyle->uifont_id;
   float strwidth, strheight;
diff --git a/source/blender/gpu/intern/gpu_buffers.c b/source/blender/gpu/intern/gpu_buffers.c
index cfc1eb05731..8496bcac693 100644
--- a/source/blender/gpu/intern/gpu_buffers.c
+++ b/source/blender/gpu/intern/gpu_buffers.c
@@ -525,8 +525,8 @@ GPU_PBVH_Buffers *GPU_pbvh_mesh_buffers_build(const int (*face_vert_indices)[3],
  * \{ */
 
 static void gpu_pbvh_grid_fill_index_buffers(GPU_PBVH_Buffers *buffers,
-                                             SubdivCCG *subdiv_ccg,
-                                             const int *face_sets,
+                                             SubdivCCG *UNUSED(subdiv_ccg),
+                                             const int *UNUSED(face_sets),
                                              int *grid_indices,
                                              uint visible_quad_len,
                                              int totgrid,