[Bf-blender-cvs] [7e06208f6a3] newboolean: Fixed an error and warning on Linux from previous commit.
Howard Trickey
noreply at git.blender.org
Sat Aug 22 14:02:54 CEST 2020
Commit: 7e06208f6a3b743e323246fb02ed47371d054097
Author: Howard Trickey
Date: Sat Aug 22 08:02:33 2020 -0400
Branches: newboolean
https://developer.blender.org/rB7e06208f6a3b743e323246fb02ed47371d054097
Fixed an error and warning on Linux from previous commit.
===================================================================
M source/blender/blenlib/intern/mesh_boolean.cc
M source/blender/makesrna/intern/rna_modifier.c
===================================================================
diff --git a/source/blender/blenlib/intern/mesh_boolean.cc b/source/blender/blenlib/intern/mesh_boolean.cc
index ff54ae128a9..178149cbedc 100644
--- a/source/blender/blenlib/intern/mesh_boolean.cc
+++ b/source/blender/blenlib/intern/mesh_boolean.cc
@@ -1511,7 +1511,7 @@ static Edge find_good_sorting_edge(const Vert *testp,
Edge esort;
const Vector<Edge> &edges = tmtopo.vert_edges(closestp);
for (Edge e : edges) {
- const const Vert *v_other = (e.v0() == closestp) ? e.v1() : e.v0();
+ const Vert *v_other = (e.v0() == closestp) ? e.v1() : e.v0();
const mpq3 &co_other = v_other->co_exact;
mpq3 evec = co_other - co_closest;
/* Get projection of evec onto plane of abscissa and ordinate. */
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index 2b8dbd6ae05..48ab052e816 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -2860,7 +2860,7 @@ static void rna_def_modifier_boolean(BlenderRNA *brna)
prop = RNA_def_property(srna, "solver", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_items(prop, prop_solver_items);
RNA_def_property_enum_default(prop, eBooleanModifierSolver_Exact);
- RNA_def_property_ui_text(prop, "Solver", "Which boolean solver to use.");
+ RNA_def_property_ui_text(prop, "Solver", "Which boolean solver to use");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
/* BMesh debugging options, only used when G_DEBUG is set */
More information about the Bf-blender-cvs
mailing list