[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45214] trunk/blender/source/blender: Partial fix for bug 30695, "Array broke crease, weird visibility and slowdown"
Nicholas Bishop
nicholasbishop at gmail.com
Tue Mar 27 14:34:09 CEST 2012
Revision: 45214
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45214
Author: nicholasbishop
Date: 2012-03-27 12:34:00 +0000 (Tue, 27 Mar 2012)
Log Message:
-----------
Partial fix for bug 30695, "Array broke crease, weird visibility and slowdown"
* Array modifier creates BMesh from DM; add missing CD_CREASE layer
for edge creases.
* With a modifier stack like mirror+subsurf+array, face normals were
wrong. Fix by removing CD_NORMAL layer from CCGDM output. Previously
the elements in this layer were simply copied, so they did not
reflect subdivision correctly.
* Minor style fixes in bmo_dupe.c.
Issues not yet addressed:
* Subsurf's optimal draw setting for hiding subdivision edges is not
respected by the array output.
* Slowdown issue; array modifier is much slower than in 2.62.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/modifiers_bmesh.c
trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
trunk/blender/source/blender/bmesh/operators/bmo_dupe.c
Modified: trunk/blender/source/blender/blenkernel/intern/modifiers_bmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/modifiers_bmesh.c 2012-03-27 11:03:10 UTC (rev 45213)
+++ trunk/blender/source/blender/blenkernel/intern/modifiers_bmesh.c 2012-03-27 12:34:00 UTC (rev 45214)
@@ -49,6 +49,7 @@
MLoop *mloop, *ml;
BMVert *v, **vtable, **verts = NULL;
BMEdge *e, **etable, **edges = NULL;
+ float has_face_normals;
BMFace *f;
BMIter liter;
BLI_array_declare(verts);
@@ -65,6 +66,9 @@
totedge = dm->getNumEdges(dm);
/* totface = dm->getNumPolys(dm); */ /* UNUSED */
+ /* add crease layer */
+ BM_data_layer_add(bm, &bm->edata, CD_CREASE);
+
vtable = MEM_callocN(sizeof(void**) * totvert, "vert table in BMDM_Copy");
etable = MEM_callocN(sizeof(void**) * totedge, "edge table in BMDM_Copy");
@@ -89,12 +93,16 @@
CustomData_to_bmesh_block(&dm->edgeData, &bm->edata, i, &e->head.data);
etable[i] = e;
+
+ /* add crease */
+ BM_elem_float_data_set(&bm->edata, e, CD_CREASE, (float)me->crease / 255.0f);
}
MEM_freeN(medge);
/*do faces*/
mp = dm->getPolyArray(dm);
mloop = dm->getLoopArray(dm);
+ has_face_normals = CustomData_has_layer(&dm->polyData, CD_NORMAL);
for (i = 0; i < dm->numPolyData; i++, mp++) {
BMLoop *l;
@@ -126,6 +134,13 @@
}
CustomData_to_bmesh_block(&dm->polyData, &bm->pdata, i, &f->head.data);
+
+ if (has_face_normals) {
+ float *fno;
+
+ fno = CustomData_bmesh_get(&bm->pdata, &f->head.data, CD_NORMAL);
+ copy_v3_v3(f->no, fno);
+ }
}
MEM_freeN(vtable);
Modified: trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2012-03-27 11:03:10 UTC (rev 45213)
+++ trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2012-03-27 12:34:00 UTC (rev 45214)
@@ -2944,6 +2944,9 @@
ccgSubSurf_getNumFinalFaces(ss),
ccgSubSurf_getNumFinalFaces(ss)*4,
ccgSubSurf_getNumFinalFaces(ss));
+
+ CustomData_free_layer_active(&ccgdm->dm.polyData, CD_NORMAL,
+ ccgdm->dm.numPolyData);
numTex = CustomData_number_of_layers(&ccgdm->dm.loopData, CD_MLOOPUV);
numCol = CustomData_number_of_layers(&ccgdm->dm.loopData, CD_MLOOPCOL);
Modified: trunk/blender/source/blender/bmesh/operators/bmo_dupe.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_dupe.c 2012-03-27 11:03:10 UTC (rev 45213)
+++ trunk/blender/source/blender/bmesh/operators/bmo_dupe.c 2012-03-27 12:34:00 UTC (rev 45214)
@@ -201,33 +201,34 @@
/* initialize pointer hashes */
vhash = BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp, "bmesh dupeops v");
ehash = BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp, "bmesh dupeops e");
-
+
+ /* duplicate flagged vertices */
for (v = BM_iter_new(&verts, source, BM_VERTS_OF_MESH, source); v; v = BM_iter_step(&verts)) {
if ( BMO_elem_flag_test(source, v, DUPE_INPUT) &&
!BMO_elem_flag_test(source, v, DUPE_DONE))
{
BMIter iter;
- int iso = 1;
+ int isolated = 1;
v2 = copy_vertex(source, v, target, vhash);
BM_ITER(f, &iter, source, BM_FACES_OF_VERT, v) {
if (BMO_elem_flag_test(source, f, DUPE_INPUT)) {
- iso = 0;
+ isolated = 0;
break;
}
}
- if (iso) {
+ if (isolated) {
BM_ITER(e, &iter, source, BM_EDGES_OF_VERT, v) {
if (BMO_elem_flag_test(source, e, DUPE_INPUT)) {
- iso = 0;
+ isolated = 0;
break;
}
}
}
- if (iso) {
+ if (isolated) {
BMO_slot_map_ptr_insert(source, op, "isovertmap", v, v2);
}
More information about the Bf-blender-cvs
mailing list