diff options
| -rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 13 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/modifier.c | 1 |
2 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index ad64aa24e42..2b7ea1e880a 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -949,9 +949,9 @@ static void ssDM_foreachMappedVert(DerivedMesh *dm, void (*func)(void *userData, for (i=0; i<dlm->totvert; i++) { MVert *mv = &dlm->mvert[i]; - if (mv->flag&ME_VERT_STEPINDEX) index++; + if (mv->flag&ME_VERT_STEPINDEX) { + index++; - if (index!=-1) { func(userData, index, mv->co, NULL, mv->no); } } @@ -1998,8 +1998,9 @@ float *mesh_get_mapped_verts_nors(Object *ob) dm= mesh_get_derived_final(ob, &needsFree); vertexcosnos= MEM_mallocN(6*sizeof(float)*me->totvert, "vertexcosnos map"); - if(dm->foreachMappedVert) + if(dm->foreachMappedVert) { dm->foreachMappedVert(dm, make_vertexcosnos__mapFunc, vertexcosnos); + } else { float *fp= vertexcosnos; int a; @@ -2257,14 +2258,12 @@ Mesh* readBobjgz(char *filename, Mesh *orgmesh) //, fluidsimDerivedMesh *fsdm) void loadFluidsimMesh(Object *srcob, int useRenderParams) { Mesh *mesh = NULL; - MeshDerivedMesh *mdm = NULL; - float (*vertCos)[3]; + float *bbStart = NULL, *bbSize = NULL; + float lastBB[3]; int displaymode = 0; int curFrame = G.scene->r.cfra - 1; /* start with 0 */ char targetDir[FILE_MAXFILE+FILE_MAXDIR], targetFile[FILE_MAXFILE+FILE_MAXDIR]; char debugStrBuffer[256]; - float *bbStart = NULL, *bbSize = NULL; - float lastBB[3]; //snprintf(debugStrBuffer,256,"loadFluidsimMesh call (obid '%s', rp %d)\n", srcob->id.name, useRenderParams); // debug if((!srcob)||(!srcob->fluidsimSettings)) { diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index d2c22e6ee54..19bd31386ff 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -1173,6 +1173,7 @@ static void booleanModifier_copyData(ModifierData *md, ModifierData *target) BooleanModifierData *tbmd = (BooleanModifierData*) target; tbmd->object = bmd->object; + tbmd->operation = bmd->operation; } static int booleanModifier_isDisabled(ModifierData *md) |