[Bf-blender-cvs] [966f4a162be] master: Cleanup: warnings, unnecessary nested header

[Campbell Barton]

Commit: 966f4a162be5ad594c6d8ed5cd742c3c0bf56c46
Author: Campbell Barton
Date:   Thu Aug 15 03:41:36 2019 +1000
Branches: master
https://developer.blender.org/rB966f4a162be5ad594c6d8ed5cd742c3c0bf56c46

Cleanup: warnings, unnecessary nested header

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

M	source/blender/blenkernel/BKE_remesh.h
M	source/blender/blenkernel/intern/remesh.c

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

diff --git a/source/blender/blenkernel/BKE_remesh.h b/source/blender/blenkernel/BKE_remesh.h
index fd99af36bdc..996e88e0ea0 100644
--- a/source/blender/blenkernel/BKE_remesh.h
+++ b/source/blender/blenkernel/BKE_remesh.h
@@ -23,24 +23,24 @@
  * \ingroup bke
  */
 
-#include "DNA_mesh_types.h"
-
 #ifdef WITH_OPENVDB
 #  include "openvdb_capi.h"
 #endif
 
+struct Mesh;
+
 /* OpenVDB Voxel Remesher */
 #ifdef WITH_OPENVDB
 struct OpenVDBLevelSet *BKE_remesh_voxel_ovdb_mesh_to_level_set_create(
-    Mesh *mesh, struct OpenVDBTransform *transform);
-Mesh *BKE_remesh_voxel_ovdb_volume_to_mesh_nomain(struct OpenVDBLevelSet *level_set,
-                                                  double isovalue,
-                                                  double adaptivity,
-                                                  bool relax_disoriented_triangles);
+    struct Mesh *mesh, struct OpenVDBTransform *transform);
+struct Mesh *BKE_remesh_voxel_ovdb_volume_to_mesh_nomain(struct OpenVDBLevelSet *level_set,
+                                                         double isovalue,
+                                                         double adaptivity,
+                                                         bool relax_disoriented_triangles);
 #endif
-Mesh *BKE_remesh_voxel_to_mesh_nomain(Mesh *mesh, float voxel_size);
+struct Mesh *BKE_remesh_voxel_to_mesh_nomain(struct Mesh *mesh, float voxel_size);
 
 /* Data reprojection functions */
-void BKE_remesh_reproject_paint_mask(Mesh *target, Mesh *source);
+void BKE_remesh_reproject_paint_mask(struct Mesh *target, struct Mesh *source);
 
 #endif /* __BKE_REMESH_H__ */
diff --git a/source/blender/blenkernel/intern/remesh.c b/source/blender/blenkernel/intern/remesh.c
index 4dd38c900c0..36e92689f1a 100644
--- a/source/blender/blenkernel/intern/remesh.c
+++ b/source/blender/blenkernel/intern/remesh.c
@@ -153,6 +153,8 @@ Mesh *BKE_remesh_voxel_to_mesh_nomain(Mesh *mesh, float voxel_size)
   new_mesh = BKE_remesh_voxel_ovdb_volume_to_mesh_nomain(level_set, 0.0, 0.0, false);
   OpenVDBLevelSet_free(level_set);
   OpenVDBTransform_free(xform);
+#else
+  UNUSED_VARS(mesh, voxel_size);
 #endif
   return new_mesh;
 }