diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-10-01 01:42:26 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-10-01 02:20:31 +0300 |
commit | 8ee4fd0bdfed1faaf89cc3e131e35cda5e8068b6 (patch) | |
tree | ffbb5ac4e8002525820c6fef23c94cbe3a651a69 /source/blender/modifiers/intern | |
parent | 3cd98d9ef7e6b85ec3c186f27879612265e3d85d (diff) |
Cleanup: style
Diffstat (limited to 'source/blender/modifiers/intern')
-rw-r--r-- | source/blender/modifiers/intern/MOD_collision.c | 26 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_meshdeform.c | 3 |
2 files changed, 15 insertions, 14 deletions
diff --git a/source/blender/modifiers/intern/MOD_collision.c b/source/blender/modifiers/intern/MOD_collision.c index 1cef98fbdf2..397cf287103 100644 --- a/source/blender/modifiers/intern/MOD_collision.c +++ b/source/blender/modifiers/intern/MOD_collision.c @@ -186,9 +186,9 @@ static void deformVerts( /* create bounding box hierarchy */ collmd->bvhtree = bvhtree_build_from_mvert( - collmd->x, - collmd->tri, collmd->tri_num, - ob->pd->pdef_sboft); + collmd->x, + collmd->tri, collmd->tri_num, + ob->pd->pdef_sboft); collmd->time_x = collmd->time_xnew = current_time; collmd->is_static = true; @@ -220,26 +220,26 @@ static void deformVerts( if (ob->pd->pdef_sboft != BLI_bvhtree_get_epsilon(collmd->bvhtree)) { BLI_bvhtree_free(collmd->bvhtree); collmd->bvhtree = bvhtree_build_from_mvert( - collmd->current_x, - collmd->tri, collmd->tri_num, - ob->pd->pdef_sboft); + collmd->current_x, + collmd->tri, collmd->tri_num, + ob->pd->pdef_sboft); } } /* happens on file load (ONLY when i decomment changes in readfile.c) */ if (!collmd->bvhtree) { collmd->bvhtree = bvhtree_build_from_mvert( - collmd->current_x, - collmd->tri, collmd->tri_num, - ob->pd->pdef_sboft); + collmd->current_x, + collmd->tri, collmd->tri_num, + ob->pd->pdef_sboft); } else if (!collmd->is_static || !is_static) { /* recalc static bounding boxes */ bvhtree_update_from_mvert( - collmd->bvhtree, - collmd->current_x, collmd->current_xnew, - collmd->tri, collmd->tri_num, - true); + collmd->bvhtree, + collmd->current_x, collmd->current_xnew, + collmd->tri, collmd->tri_num, + true); } collmd->is_static = is_static; diff --git a/source/blender/modifiers/intern/MOD_meshdeform.c b/source/blender/modifiers/intern/MOD_meshdeform.c index aac191bc511..5aa134fc7e1 100644 --- a/source/blender/modifiers/intern/MOD_meshdeform.c +++ b/source/blender/modifiers/intern/MOD_meshdeform.c @@ -328,7 +328,8 @@ static void meshdeformModifier_do( /* Write binding data to original modifier. */ Scene *scene = DEG_get_evaluated_scene(ctx->depsgraph); Object *ob_orig = DEG_get_original_object(ob); - MeshDeformModifierData *mmd_orig = (MeshDeformModifierData*)modifiers_findByName(ob_orig, mmd->modifier.name); + MeshDeformModifierData *mmd_orig = (MeshDeformModifierData *)modifiers_findByName( + ob_orig, mmd->modifier.name); recursive = 1; mmd->bindfunc(scene, mmd_orig, cagemesh, (float *)vertexCos, numVerts, cagemat); |