Commit: a75700a775257f9645b147269a43a5dc1a273e94
Author: Antonio Vazquez
Date: Fri Sep 11 17:08:42 2020 +0200
Branches: lanpr-under-gp
https://developer.blender.org/rBa75700a775257f9645b147269a43a5dc1a273e94
LineArt: Fix merge problem
===================================================================
M source/blender/editors/mesh/editmesh_intersect.c
===================================================================
diff --git a/source/blender/editors/mesh/editmesh_intersect.c
b/source/blender/editors/mesh/editmesh_intersect.c
index 8bf288e4597..1b5e374b2a7 100644
--- a/source/blender/editors/mesh/editmesh_intersect.c
+++ b/source/blender/editors/mesh/editmesh_intersect.c
@@ -294,13 +294,11 @@ void MESH_OT_intersect(struct wmOperatorType *ot)
{0, NULL, 0, NULL, NULL},
};
-#ifdef WITH_GMP
static const EnumPropertyItem isect_intersect_solver_items[] = {
{ISECT_SOLVER_FAST, "FAST", 0, "Fast", "Faster Solver, some
limitations"},
{ISECT_SOLVER_EXACT, "EXACT", 0, "Exact", "Exact Solver, slower, handles
more cases"},
{0, NULL, 0, NULL, NULL},
};
-#endif
/* identifiers */
ot->name = "Intersect (Knife)";
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
