fix [#35026] Curve build modifier

8 files changed, 108 insertions, 37 deletions

diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h
index 429dacb90ef..d208a6b919d 100644
--- a/source/blender/blenkernel/BKE_mesh.h
+++ b/source/blender/blenkernel/BKE_mesh.h
@@ -36,6 +36,7 @@
 struct ID;
 struct BoundBox;
 struct DispList;
+struct EdgeHash;
 struct ListBase;
 struct BMEditMesh;
 struct BMesh;
@@ -340,6 +341,7 @@ void BKE_mesh_loops_to_mface_corners(struct CustomData *fdata, struct CustomData
                                      const int polyindex, const int mf_len,
                                      const int numTex, const int numCol, const int hasPCol, const int hasOrigSpace);
 
+void BKE_mesh_poly_edgehash_insert(struct EdgeHash *ehash, const struct MPoly *mp, const struct MLoop *mloop);
 void BKE_mesh_poly_calc_angles(struct MVert *mvert, struct MLoop *mloop,
                                struct MPoly *mp, float angles[]);
 
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index 1a3f5a700b9..ee9812451eb 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -1837,8 +1837,6 @@ DerivedMesh *CDDM_from_curve_displist(Object *ob, ListBase *dispbase)
 	MEM_freeN(allloop);
 	MEM_freeN(allpoly);
 
-	CDDM_calc_edges(dm);
-
 	return dm;
 }
 
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c
index 0d662711df0..1e1ea0479bd 100644
--- a/source/blender/blenkernel/intern/mesh.c
+++ b/source/blender/blenkernel/intern/mesh.c
@@ -1202,6 +1202,80 @@ void BKE_mesh_from_metaball(ListBase *lb, Mesh *me)
 	}
 }
 
+/**
+ * Specialized function to use when we _know_ existing edges don't overlap with poly edges.
+ */
+static void make_edges_mdata_extend(MEdge **r_alledge, int *r_totedge,
+                                    const MPoly *mpoly, MLoop *mloop,
+                                    const int totpoly)
+{
+	int totedge = *r_totedge;
+	int totedge_new;
+	EdgeHash *eh;
+	const MPoly *mp;
+	int i;
+
+	eh = BLI_edgehash_new();
+
+	for (i = 0, mp = mpoly; i < totpoly; i++, mp++) {
+		BKE_mesh_poly_edgehash_insert(eh, mp, mloop + mp->loopstart);
+	}
+
+	totedge_new = BLI_edgehash_size(eh);
+
+#ifdef DEBUG
+	/* ensure that theres no overlap! */
+	if (totedge_new) {
+		MEdge *medge = *r_alledge;
+		for (i = 0; i < totedge; i++, medge++) {
+			BLI_assert(BLI_edgehash_haskey(eh, medge->v1, medge->v2) == false);
+		}
+	}
+#endif
+
+	if (totedge_new) {
+		EdgeHashIterator *ehi;
+		MEdge *medge;
+		unsigned int e_index = totedge;
+
+		*r_alledge = medge = (*r_alledge ? MEM_reallocN(*r_alledge, sizeof(MEdge) * (totedge + totedge_new)) :
+		                                   MEM_callocN(sizeof(MEdge) * totedge_new, __func__));
+		medge += totedge;
+
+		totedge += totedge_new;
+
+		/* --- */
+		for (ehi = BLI_edgehashIterator_new(eh);
+		     BLI_edgehashIterator_isDone(ehi) == FALSE;
+		     BLI_edgehashIterator_step(ehi), ++medge, e_index++)
+		{
+			BLI_edgehashIterator_getKey(ehi, &medge->v1, &medge->v2);
+			BLI_edgehashIterator_setValue(ehi, SET_UINT_IN_POINTER(e_index));
+
+			medge->crease = medge->bweight = 0;
+			medge->flag = ME_EDGEDRAW | ME_EDGERENDER;
+		}
+		BLI_edgehashIterator_free(ehi);
+
+		*r_totedge = totedge;
+
+
+		for (i = 0, mp = mpoly; i < totpoly; i++, mp++) {
+			MLoop *l = &mloop[mp->loopstart];
+			MLoop *l_prev = (l + (mp->totloop - 1));
+			int j;
+			for (j = 0; j < mp->totloop; j++, l++) {
+				/* lookup hashed edge index */
+				l_prev->e = GET_UINT_FROM_POINTER(BLI_edgehash_lookup(eh, l_prev->v, l->v));
+				l_prev = l;
+			}
+		}
+	}
+
+	BLI_edgehash_free(eh, NULL);
+}
+
+
 /* Initialize mverts, medges and, faces for converting nurbs to mesh and derived mesh */
 /* return non-zero on error */
 int BKE_mesh_nurbs_to_mdata(Object *ob, MVert **allvert, int *totvert,
@@ -1241,6 +1315,7 @@ int BKE_mesh_nurbs_displist_to_mdata(Object *ob, ListBase *dispbase,
 
 	cu = ob->data;
 
+
 	conv_polys |= cu->flag & CU_3D;      /* 2d polys are filled with DL_INDEX3 displists */
 	conv_polys |= ob->type == OB_SURF;   /* surf polys are never filled */
 
@@ -1461,17 +1536,16 @@ int BKE_mesh_nurbs_displist_to_mdata(Object *ob, ListBase *dispbase,
 		dl = dl->next;
 	}
 	
+	if (totvlak) {
+		make_edges_mdata_extend(alledge, &totedge,
+		                        *allpoly, *allloop, totvlak);
+	}
+
 	*_totpoly = totvlak;
 	*_totloop = totloop;
 	*_totedge = totedge;
 	*_totvert = totvert;
 
-	/* not uded for bmesh */
-#if 0
-	make_edges_mdata(*allvert, *allface, *allloop, *allpoly, totvert, totvlak, *_totloop, *_totpoly, 0, alledge, _totedge);
-	mfaces_strip_loose(*allface, _totface);
-#endif
-
 	return 0;
 }
 
@@ -1522,8 +1596,6 @@ void BKE_mesh_from_nurbs_displist(Object *ob, ListBase *dispbase, const bool use
 		}
 
 		BKE_mesh_calc_normals(me->mvert, me->totvert, me->mloop, me->mpoly, me->totloop, me->totpoly, NULL);
-
-		BKE_mesh_calc_edges(me, true, false);
 	}
 	else {
 		me = BKE_mesh_add(G.main, "Mesh");
@@ -3415,6 +3487,22 @@ void BKE_mesh_poly_calc_angles(MVert *mvert, MLoop *mloop,
 
 #else /* equivalent the function above but avoid multiple subtractions + normalize */
 
+void BKE_mesh_poly_edgehash_insert(EdgeHash *ehash, const MPoly *mp, const MLoop *mloop)
+{
+	const MLoop *ml, *ml_next;
+	int i = mp->totloop;
+
+	ml_next = mloop;       /* first loop */
+	ml = &ml_next[i - 1];  /* last loop */
+
+	while (i-- != 0) {
+		BLI_edgehash_insert(ehash, ml->v, ml_next->v, NULL);
+
+		ml = ml_next;
+		ml_next++;
+	}
+}
+
 void BKE_mesh_poly_calc_angles(MVert *mvert, MLoop *mloop,
                                  MPoly *mp, float angles[])
 {
diff --git a/source/blender/blenkernel/intern/mesh_validate.c b/source/blender/blenkernel/intern/mesh_validate.c
index 3f118129dac..6fb83b83c25 100644
--- a/source/blender/blenkernel/intern/mesh_validate.c
+++ b/source/blender/blenkernel/intern/mesh_validate.c
@@ -37,9 +37,9 @@
 
 #include "BLO_sys_types.h"
 
+#include "BLI_utildefines.h"
 #include "BLI_edgehash.h"
 #include "BLI_math_base.h"
-#include "BLI_utildefines.h"
 
 #include "BKE_deform.h"
 #include "BKE_depsgraph.h"
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index f131e7297ed..74a50389cd5 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -62,6 +62,7 @@
 #include "DNA_ipo_types.h" // XXX old animation system stuff... to be removed!
 #include "DNA_listBase.h"
 
+#include "BLI_utildefines.h"
 #include "BLI_edgehash.h"
 #include "BLI_rand.h"
 #include "BLI_jitter.h"
@@ -70,7 +71,6 @@
 #include "BLI_kdtree.h"
 #include "BLI_kdopbvh.h"
 #include "BLI_threads.h"
-#include "BLI_utildefines.h"
 #include "BLI_linklist.h"
 
 #include "BKE_main.h"
diff --git a/source/blender/blenlib/BLI_edgehash.h b/source/blender/blenlib/BLI_edgehash.h
index 8d7d3b05653..ad71e610248 100644
--- a/source/blender/blenlib/BLI_edgehash.h
+++ b/source/blender/blenlib/BLI_edgehash.h
@@ -62,7 +62,7 @@ void           *BLI_edgehash_lookup(EdgeHash *eh, unsigned int v0, unsigned int
 void          **BLI_edgehash_lookup_p(EdgeHash *eh, unsigned int v0, unsigned int v1);
 
 /* Return boolean true/false if edge (v0,v1) in hash. */
-int             BLI_edgehash_haskey(EdgeHash *eh, unsigned int v0, unsigned int v1);
+bool            BLI_edgehash_haskey(EdgeHash *eh, unsigned int v0, unsigned int v1);
 
 /* Return number of keys in hash. */
 int             BLI_edgehash_size(EdgeHash *eh);
@@ -95,6 +95,6 @@ void                BLI_edgehashIterator_setValue(EdgeHashIterator *ehi, void *v
 void                BLI_edgehashIterator_step(EdgeHashIterator *ehi);
 
 /* Determine if an iterator is done. */
-int                 BLI_edgehashIterator_isDone(EdgeHashIterator *ehi);
+bool                BLI_edgehashIterator_isDone(EdgeHashIterator *ehi);
 
 #endif
diff --git a/source/blender/blenlib/intern/edgehash.c b/source/blender/blenlib/intern/edgehash.c
index 4fb48d19239..d75ada9e799 100644
--- a/source/blender/blenlib/intern/edgehash.c
+++ b/source/blender/blenlib/intern/edgehash.c
@@ -153,7 +153,7 @@ void *BLI_edgehash_lookup(EdgeHash *eh, unsigned int v0, unsigned int v1)
 	return value_p ? *value_p : NULL;
 }
 
-int BLI_edgehash_haskey(EdgeHash *eh, unsigned int v0, unsigned int v1)
+bool BLI_edgehash_haskey(EdgeHash *eh, unsigned int v0, unsigned int v1)
 {
 	return BLI_edgehash_lookup_p(eh, v0, v1) != NULL;
 }
@@ -255,8 +255,8 @@ void BLI_edgehashIterator_step(EdgeHashIterator *ehi)
 		}
 	}
 }
-int BLI_edgehashIterator_isDone(EdgeHashIterator *ehi)
+bool BLI_edgehashIterator_isDone(EdgeHashIterator *ehi)
 {
-	return !ehi->curEntry;
+	return (ehi->curEntry == NULL);
 }
 
diff --git a/source/blender/editors/mesh/editface.c b/source/blender/editors/mesh/editface.c
index 5da2f909d52..aa1d53367c2 100644
--- a/source/blender/editors/mesh/editface.c
+++ b/source/blender/editors/mesh/editface.c
@@ -179,23 +179,6 @@ void paintface_reveal(Object *ob)
 
 /* Set tface seams based on edge data, uses hash table to find seam edges. */
 
-static void hash_add_face(EdgeHash *ehash, MPoly *mp, MLoop *mloop)
-{
-	MLoop *ml, *ml_next;
-	int i = mp->totloop;
-
-	ml_next = mloop;       /* first loop */
-	ml = &ml_next[i - 1];  /* last loop */
-
-	while (i-- != 0) {
-		BLI_edgehash_insert(ehash, ml->v, ml_next->v, NULL);
-
-		ml = ml_next;
-		ml_next++;
-	}
-}
-
-
 static void select_linked_tfaces_with_seams(int mode, Mesh *me, unsigned int index)
 {
 	EdgeHash *ehash, *seamhash;
@@ -217,7 +200,7 @@ static void select_linked_tfaces_with_seams(int mode, Mesh *me, unsigned int ind
 	if (mode == 0 || mode == 1) {
 		/* only put face under cursor in array */
 		mp = ((MPoly *)me->mpoly) + index;
-		hash_add_face(ehash, mp, me->mloop + mp->loopstart);
+		BKE_mesh_poly_edgehash_insert(ehash, mp, me->mloop + mp->loopstart);
 		linkflag[index] = 1;
 	}
 	else {
@@ -228,7 +211,7 @@ static void select_linked_tfaces_with_seams(int mode, Mesh *me, unsigned int ind
 				/* pass */
 			}
 			else if (mp->flag & ME_FACE_SEL) {
-				hash_add_face(ehash, mp, me->mloop + mp->loopstart);
+				BKE_mesh_poly_edgehash_insert(ehash, mp, me->mloop + mp->loopstart);
 				linkflag[a] = 1;
 			}
 		}
@@ -257,7 +240,7 @@ static void select_linked_tfaces_with_seams(int mode, Mesh *me, unsigned int ind
 
 				if (mark) {
 					linkflag[a] = 1;
-					hash_add_face(ehash, mp, me->mloop + mp->loopstart);
+					BKE_mesh_poly_edgehash_insert(ehash, mp, me->mloop + mp->loopstart);
 					do_it = true;
 				}
 			}