[Bf-blender-cvs] [0cb53d4740d] master: Cleanup: warnings

[Campbell Barton]

Commit: 0cb53d4740d29e8ebbab33f609bbbc1e3a42e5bd
Author: Campbell Barton
Date:   Fri May 1 12:34:43 2020 +1000
Branches: master
https://developer.blender.org/rB0cb53d4740d29e8ebbab33f609bbbc1e3a42e5bd

Cleanup: warnings

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

M	source/blender/blenkernel/intern/multires_reshape.h
M	source/blender/blenkernel/intern/multires_reshape_subdivide.c
M	source/blender/blenkernel/intern/multires_unsubdivide.c

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

diff --git a/source/blender/blenkernel/intern/multires_reshape.h b/source/blender/blenkernel/intern/multires_reshape.h
index e3127885aa3..644404b5cb3 100644
--- a/source/blender/blenkernel/intern/multires_reshape.h
+++ b/source/blender/blenkernel/intern/multires_reshape.h
@@ -25,6 +25,7 @@
 #define __BKE_INTERN_MULTIRES_RESHAPE_H__
 
 #include "BLI_sys_types.h"
+
 #include "BKE_multires.h"
 
 struct Depsgraph;
diff --git a/source/blender/blenkernel/intern/multires_reshape_subdivide.c b/source/blender/blenkernel/intern/multires_reshape_subdivide.c
index 16c67da27fe..5923e0430f2 100644
--- a/source/blender/blenkernel/intern/multires_reshape_subdivide.c
+++ b/source/blender/blenkernel/intern/multires_reshape_subdivide.c
@@ -42,7 +42,7 @@
 
 #include "multires_reshape.h"
 
-void multires_subdivide_create_object_space_linear_grids(Mesh *mesh)
+static void multires_subdivide_create_object_space_linear_grids(Mesh *mesh)
 {
   MDisps *mdisps = CustomData_get_layer(&mesh->ldata, CD_MDISPS);
   const int totpoly = mesh->totpoly;
diff --git a/source/blender/blenkernel/intern/multires_unsubdivide.c b/source/blender/blenkernel/intern/multires_unsubdivide.c
index 0aa75d2f5a0..a2c6aa02554 100644
--- a/source/blender/blenkernel/intern/multires_unsubdivide.c
+++ b/source/blender/blenkernel/intern/multires_unsubdivide.c
@@ -843,8 +843,8 @@ static BMesh *get_bmesh_from_mesh(Mesh *mesh)
 }
 
 /* Datalayer names to store the original indices of the elements before modifying the mesh. */
-const static char lname[] = "l_remap_index";
-const static char vname[] = "v_remap_index";
+static const char lname[] = "l_remap_index";
+static const char vname[] = "v_remap_index";
 
 static void multires_unsubdivide_free_original_datalayers(Mesh *mesh)
 {