diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2011-04-03 04:25:01 +0400 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2011-04-03 04:25:01 +0400 |
| commit | 60d81b09c60027e056a39dc80d5b89ed7c07aff3 (patch) | |
| tree | bbeedb2b7743e1c14aeade49019ed386e07e2092 /source/blender/blenkernel/intern | |
| parent | 90fa130a696afd50676aa50578e0563a02493884 (diff) | |
=bmesh=
Implemented the solidify modifier (but
not the editmode tool, yet).
Diffstat (limited to 'source/blender/blenkernel/intern')
| -rw-r--r-- | source/blender/blenkernel/intern/bvhutils.c | 4 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/customdata.c | 7 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/shrinkwrap.c | 4 |
3 files changed, 11 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/bvhutils.c b/source/blender/blenkernel/intern/bvhutils.c index 7a3c4bd5928..1a5458323d8 100644 --- a/source/blender/blenkernel/intern/bvhutils.c +++ b/source/blender/blenkernel/intern/bvhutils.c @@ -581,6 +581,7 @@ BVHTree* bvhtree_from_mesh_faces(BVHTreeFromMesh *data, DerivedMesh *mesh, float if(tree != NULL) { /* XXX, for snap only, em & dm are assumed to be aligned, since dm is the em's cage */ +#if 0 //BMESH_TODO EditMesh *em= data->em_evil; if(em) { EditFace *efa= em->faces.first; @@ -596,6 +597,9 @@ BVHTree* bvhtree_from_mesh_faces(BVHTreeFromMesh *data, DerivedMesh *mesh, float BLI_bvhtree_insert(tree, i, co[0], face[i].v4 ? 4 : 3); } } +#else + if (0) { +#endif } else { for(i = 0; i < numFaces; i++) { diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c index e40275121ae..f94cb3ec347 100644 --- a/source/blender/blenkernel/intern/customdata.c +++ b/source/blender/blenkernel/intern/customdata.c @@ -1221,6 +1221,7 @@ static void customData_update_offsets(CustomData *data) } data->totsize = offset; + customData_update_typemap(data); } int CustomData_get_layer_index(const CustomData *data, int type) @@ -1666,10 +1667,10 @@ void CustomData_free_temporary(CustomData *data, int totelem) if (i != j) data->layers[j] = data->layers[i]; - - if ((layer->flag & CD_FLAG_TEMPORARY) == CD_FLAG_TEMPORARY) + + if ((layer->flag & CD_FLAG_TEMPORARY) == CD_FLAG_TEMPORARY) { customData_free_layer__internal(layer, totelem); - else + } else j++; } diff --git a/source/blender/blenkernel/intern/shrinkwrap.c b/source/blender/blenkernel/intern/shrinkwrap.c index 5311f3a9c38..1db15188dff 100644 --- a/source/blender/blenkernel/intern/shrinkwrap.c +++ b/source/blender/blenkernel/intern/shrinkwrap.c @@ -599,7 +599,9 @@ void shrinkwrapModifier_deform(ShrinkwrapModifierData *smd, Object *ob, DerivedM } //free memory - if(ss_mesh) + if(ss_mesh) { + ss_mesh->needsFree = 1; ss_mesh->release(ss_mesh); + } } |