[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60143] trunk/blender/source/blender/ modifiers/intern/MOD_explode.c: replace BLI_edgehash_insert with BLI_edgehash_reinsert for explode operator , was inserting the same edges more then once.
Campbell Barton
ideasman42 at gmail.com
Sun Sep 15 03:47:41 CEST 2013
Revision: 60143
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60143
Author: campbellbarton
Date: 2013-09-15 01:47:40 +0000 (Sun, 15 Sep 2013)
Log Message:
-----------
replace BLI_edgehash_insert with BLI_edgehash_reinsert for explode operator, was inserting the same edges more then once.
Modified Paths:
--------------
trunk/blender/source/blender/modifiers/intern/MOD_explode.c
Modified: trunk/blender/source/blender/modifiers/intern/MOD_explode.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_explode.c 2013-09-15 01:46:25 UTC (rev 60142)
+++ trunk/blender/source/blender/modifiers/intern/MOD_explode.c 2013-09-15 01:47:40 UTC (rev 60143)
@@ -586,12 +586,12 @@
v3 = vertpa[mf->v3];
if (v1 != v2) {
- BLI_edgehash_insert(edgehash, mf->v1, mf->v2, NULL);
+ BLI_edgehash_reinsert(edgehash, mf->v1, mf->v2, NULL);
(*fs) |= 1;
}
if (v2 != v3) {
- BLI_edgehash_insert(edgehash, mf->v2, mf->v3, NULL);
+ BLI_edgehash_reinsert(edgehash, mf->v2, mf->v3, NULL);
(*fs) |= 2;
}
@@ -599,24 +599,24 @@
v4 = vertpa[mf->v4];
if (v3 != v4) {
- BLI_edgehash_insert(edgehash, mf->v3, mf->v4, NULL);
+ BLI_edgehash_reinsert(edgehash, mf->v3, mf->v4, NULL);
(*fs) |= 4;
}
if (v1 != v4) {
- BLI_edgehash_insert(edgehash, mf->v1, mf->v4, NULL);
+ BLI_edgehash_reinsert(edgehash, mf->v1, mf->v4, NULL);
(*fs) |= 8;
}
/* mark center vertex as a fake edge split */
if (*fs == 15)
- BLI_edgehash_insert(edgehash, mf->v1, mf->v3, NULL);
+ BLI_edgehash_reinsert(edgehash, mf->v1, mf->v3, NULL);
}
else {
(*fs) |= 16; /* mark face as tri */
if (v1 != v3) {
- BLI_edgehash_insert(edgehash, mf->v1, mf->v3, NULL);
+ BLI_edgehash_reinsert(edgehash, mf->v1, mf->v3, NULL);
(*fs) |= 4;
}
}
@@ -846,11 +846,11 @@
mf = &mface[i];
/* set face vertices to exist in particle group */
- BLI_edgehash_insert(vertpahash, mf->v1, mindex, NULL);
- BLI_edgehash_insert(vertpahash, mf->v2, mindex, NULL);
- BLI_edgehash_insert(vertpahash, mf->v3, mindex, NULL);
+ BLI_edgehash_reinsert(vertpahash, mf->v1, mindex, NULL);
+ BLI_edgehash_reinsert(vertpahash, mf->v2, mindex, NULL);
+ BLI_edgehash_reinsert(vertpahash, mf->v3, mindex, NULL);
if (mf->v4)
- BLI_edgehash_insert(vertpahash, mf->v4, mindex, NULL);
+ BLI_edgehash_reinsert(vertpahash, mf->v4, mindex, NULL);
}
/* make new vertice indexes & count total vertices after duplication */
More information about the Bf-blender-cvs
mailing list