diff options
Diffstat (limited to 'source/blender/modifiers/intern')
-rw-r--r-- | source/blender/modifiers/intern/MOD_collision.c | 6 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_fluidsim_util.c | 4 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_mask.c | 28 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_uvproject.c | 4 |
4 files changed, 21 insertions, 21 deletions
diff --git a/source/blender/modifiers/intern/MOD_collision.c b/source/blender/modifiers/intern/MOD_collision.c index 4c5ce184c22..83a366815de 100644 --- a/source/blender/modifiers/intern/MOD_collision.c +++ b/source/blender/modifiers/intern/MOD_collision.c @@ -136,7 +136,7 @@ static void deformVerts(ModifierData *md, Object *ob, if (G.rt > 0) printf("current_time %f, collmd->time_xnew %f\n", current_time, collmd->time_xnew); - numverts = dm->getNumVerts ( dm ); + numverts = dm->getNumVerts (dm); if ((current_time > collmd->time_xnew)|| (BKE_ptcache_get_continue_physics())) { unsigned int i; @@ -150,7 +150,7 @@ static void deformVerts(ModifierData *md, Object *ob, for ( i = 0; i < numverts; i++ ) { // we save global positions - mul_m4_v3( ob->obmat, collmd->x[i].co ); + mul_m4_v3(ob->obmat, collmd->x[i].co); } collmd->xnew = MEM_dupallocN(collmd->x); // frame end position @@ -181,7 +181,7 @@ static void deformVerts(ModifierData *md, Object *ob, for (i = 0; i < numverts; i++) { // we save global positions - mul_m4_v3( ob->obmat, collmd->xnew[i].co ); + mul_m4_v3(ob->obmat, collmd->xnew[i].co); } memcpy(collmd->current_xnew, collmd->x, numverts*sizeof(MVert)); diff --git a/source/blender/modifiers/intern/MOD_fluidsim_util.c b/source/blender/modifiers/intern/MOD_fluidsim_util.c index ac3341f8e8d..80c48062635 100644 --- a/source/blender/modifiers/intern/MOD_fluidsim_util.c +++ b/source/blender/modifiers/intern/MOD_fluidsim_util.c @@ -406,7 +406,7 @@ static void fluidsim_read_vel_cache(FluidsimModifierData *fluidmd, DerivedMesh * return; } - gzread(gzf, &wri, sizeof( wri )); + gzread(gzf, &wri, sizeof(wri)); if (wri != totvert) { MEM_freeN(fss->meshVelocities); fss->meshVelocities = NULL; @@ -415,7 +415,7 @@ static void fluidsim_read_vel_cache(FluidsimModifierData *fluidmd, DerivedMesh * for (i=0; i<totvert;i++) { for (j=0; j<3; j++) { - gzread(gzf, &wrf, sizeof( wrf )); + gzread(gzf, &wrf, sizeof(wrf)); velarray[i].vel[j] = wrf; } } diff --git a/source/blender/modifiers/intern/MOD_mask.c b/source/blender/modifiers/intern/MOD_mask.c index b667fc4bd29..32376acc553 100644 --- a/source/blender/modifiers/intern/MOD_mask.c +++ b/source/blender/modifiers/intern/MOD_mask.c @@ -279,8 +279,8 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, dm->getEdge(dm, i, &me); /* only add if both verts will be in new mesh */ - if ( BLI_ghash_haskey(vertHash, SET_INT_IN_POINTER(me.v1)) && - BLI_ghash_haskey(vertHash, SET_INT_IN_POINTER(me.v2)) ) + if (BLI_ghash_haskey(vertHash, SET_INT_IN_POINTER(me.v1)) && + BLI_ghash_haskey(vertHash, SET_INT_IN_POINTER(me.v2))) { BLI_ghash_insert(edgeHash, SET_INT_IN_POINTER(i), SET_INT_IN_POINTER(numEdges)); numEdges++; @@ -320,10 +320,10 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, mvert_new = CDDM_get_verts(result); /* using ghash-iterators, map data into new mesh */ - /* vertices */ - for ( hashIter = BLI_ghashIterator_new(vertHash); - !BLI_ghashIterator_isDone(hashIter); - BLI_ghashIterator_step(hashIter) ) + /* vertices */ + for (hashIter = BLI_ghashIterator_new(vertHash); + !BLI_ghashIterator_isDone(hashIter); + BLI_ghashIterator_step(hashIter) ) { MVert source; MVert *dest; @@ -338,10 +338,10 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, } BLI_ghashIterator_free(hashIter); - /* edges */ - for ( hashIter = BLI_ghashIterator_new(edgeHash); - !BLI_ghashIterator_isDone(hashIter); - BLI_ghashIterator_step(hashIter) ) + /* edges */ + for (hashIter = BLI_ghashIterator_new(edgeHash); + !BLI_ghashIterator_isDone(hashIter); + BLI_ghashIterator_step(hashIter)) { MEdge source; MEdge *dest; @@ -359,10 +359,10 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, } BLI_ghashIterator_free(hashIter); - /* faces */ - for ( hashIter = BLI_ghashIterator_new(polyHash); - !BLI_ghashIterator_isDone(hashIter); - BLI_ghashIterator_step(hashIter) ) + /* faces */ + for (hashIter = BLI_ghashIterator_new(polyHash); + !BLI_ghashIterator_isDone(hashIter); + BLI_ghashIterator_step(hashIter) ) { int oldIndex = GET_INT_FROM_POINTER(BLI_ghashIterator_getKey(hashIter)); int newIndex = GET_INT_FROM_POINTER(BLI_ghashIterator_getValue(hashIter)); diff --git a/source/blender/modifiers/intern/MOD_uvproject.c b/source/blender/modifiers/intern/MOD_uvproject.c index 2b289efa437..80a3b70d8e3 100644 --- a/source/blender/modifiers/intern/MOD_uvproject.c +++ b/source/blender/modifiers/intern/MOD_uvproject.c @@ -224,12 +224,12 @@ static DerivedMesh *uvprojectModifier_do(UVProjectModifierData *umd, if (cam->type == CAM_PERSP) { float perspmat[4][4]; - perspective_m4( perspmat, xmin, xmax, ymin, ymax, cam->clipsta, cam->clipend); + perspective_m4(perspmat, xmin, xmax, ymin, ymax, cam->clipsta, cam->clipend); mult_m4_m4m4(tmpmat, perspmat, projectors[i].projmat); } else { /* if (cam->type == CAM_ORTHO) */ float orthomat[4][4]; - orthographic_m4( orthomat, xmin, xmax, ymin, ymax, cam->clipsta, cam->clipend); + orthographic_m4(orthomat, xmin, xmax, ymin, ymax, cam->clipsta, cam->clipend); mult_m4_m4m4(tmpmat, orthomat, projectors[i].projmat); } } |