[Bf-blender-cvs] [5cc3f006b50] newboolean: Quient some warnings on Linux.
Howard Trickey
noreply at git.blender.org
Fri Jun 12 00:46:31 CEST 2020
Commit: 5cc3f006b507865e38fe5f8d239761e404985f5d
Author: Howard Trickey
Date: Thu Jun 11 18:46:02 2020 -0400
Branches: newboolean
https://developer.blender.org/rB5cc3f006b507865e38fe5f8d239761e404985f5d
Quient some warnings on Linux.
===================================================================
M source/blender/blenlib/BLI_mpq2.hh
M source/blender/blenlib/intern/boolean.cc
===================================================================
diff --git a/source/blender/blenlib/BLI_mpq2.hh b/source/blender/blenlib/BLI_mpq2.hh
index 3769abe8ca6..b9a519404b4 100644
--- a/source/blender/blenlib/BLI_mpq2.hh
+++ b/source/blender/blenlib/BLI_mpq2.hh
@@ -141,8 +141,6 @@ struct mpq2 {
uint32_t hash() const;
};
-uint32_t hash_mpq_class(const mpq_class &value);
-
} // namespace blender
#endif /* __BLI_MPQ_HH__ */
diff --git a/source/blender/blenlib/intern/boolean.cc b/source/blender/blenlib/intern/boolean.cc
index 12b461242bd..056529a552f 100644
--- a/source/blender/blenlib/intern/boolean.cc
+++ b/source/blender/blenlib/intern/boolean.cc
@@ -456,7 +456,7 @@ static PatchesInfo find_patches(const TriMesh &tm, const TriMeshTopology &tmtopo
* Also, e may be reversed in tri.
* Set *r_rev to true if it is reversed, else false.
*/
-int find_flap_vert(const IndexedTriangle &tri, const Edge e, bool *r_rev)
+static int find_flap_vert(const IndexedTriangle &tri, const Edge e, bool *r_rev)
{
*r_rev = false;
int flapv;
@@ -791,9 +791,9 @@ static CellsInfo find_cells(const TriMesh &tm, const TriMeshTopology &tmtopo, Pa
* all other cells.
*/
static int find_ambient_cell(const TriMesh &tm,
- const TriMeshTopology &tmtopo,
- const PatchesInfo &pinfo,
- const CellsInfo &cinfo)
+ const TriMeshTopology &UNUSED(tmtopo),
+ const PatchesInfo &UNUSED(pinfo),
+ const CellsInfo &UNUSED(cinfo))
{
int dbg_level = 1;
if (dbg_level > 0) {
@@ -817,9 +817,7 @@ static int find_ambient_cell(const TriMesh &tm,
return 0;
}
-static void propagate_windings_and_flag(const TriMesh &tm,
- const TriMeshTopology &tmtopo,
- PatchesInfo &pinfo,
+static void propagate_windings_and_flag(PatchesInfo &pinfo,
CellsInfo &cinfo,
int c_ambient,
int bool_optype)
@@ -923,7 +921,7 @@ static TriMesh self_boolean(const TriMesh &tm_in, int bool_optype)
CellsInfo cinfo = find_cells(tm_si, tm_si_topo, pinfo);
cinfo.init_windings(1);
int c_ambient = find_ambient_cell(tm_si, tm_si_topo, pinfo, cinfo);
- propagate_windings_and_flag(tm_si, tm_si_topo, pinfo, cinfo, c_ambient, bool_optype);
+ propagate_windings_and_flag(pinfo, cinfo, c_ambient, bool_optype);
return tm_si;
}
More information about the Bf-blender-cvs
mailing list