diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-08-14 16:29:46 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-08-14 16:32:24 +0300 |
commit | 03b2371387dcae9f801cabbc1819b1d7e3350829 (patch) | |
tree | 0300655f20a06a8e5c807b5fe6263b47c686dedb /source/blender/modifiers | |
parent | bc4fe45aef7e52f9e7a2bd5e370c6791c58af832 (diff) |
Cleanup: move trailing comments to avoid wrapping code
Some statements were split across multiple lines because of their
trailing comments.
In most cases it's clearer to put the comments above.
Diffstat (limited to 'source/blender/modifiers')
-rw-r--r-- | source/blender/modifiers/intern/MOD_bevel.c | 5 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_boolean.c | 5 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_simpledeform.c | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/modifiers/intern/MOD_bevel.c b/source/blender/modifiers/intern/MOD_bevel.c index 309af4d4812..a05b7023392 100644 --- a/source/blender/modifiers/intern/MOD_bevel.c +++ b/source/blender/modifiers/intern/MOD_bevel.c @@ -214,8 +214,9 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mes result = BKE_mesh_from_bmesh_for_eval_nomain(bm, NULL); - BLI_assert(bm->vtoolflagpool == NULL && bm->etoolflagpool == NULL && - bm->ftoolflagpool == NULL); /* make sure we never alloc'd these */ + /* Make sure we never alloc'd these. */ + BLI_assert(bm->vtoolflagpool == NULL && bm->etoolflagpool == NULL && bm->ftoolflagpool == NULL); + BM_mesh_free(bm); result->runtime.cd_dirty_vert |= CD_MASK_NORMAL; diff --git a/source/blender/modifiers/intern/MOD_boolean.c b/source/blender/modifiers/intern/MOD_boolean.c index 107622e33c0..dc4898c83ff 100644 --- a/source/blender/modifiers/intern/MOD_boolean.c +++ b/source/blender/modifiers/intern/MOD_boolean.c @@ -262,8 +262,9 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mes BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) { mul_transposed_m3_v3(nmat, efa->no); normalize_v3(efa->no); - BM_elem_flag_enable( - efa, BM_FACE_TAG); /* temp tag to test which side split faces are from */ + + /* Temp tag to test which side split faces are from. */ + BM_elem_flag_enable(efa, BM_FACE_TAG); /* remap material */ if (LIKELY(efa->mat_nr < ob_src_totcol)) { diff --git a/source/blender/modifiers/intern/MOD_simpledeform.c b/source/blender/modifiers/intern/MOD_simpledeform.c index 8d511207b9b..d10d74da453 100644 --- a/source/blender/modifiers/intern/MOD_simpledeform.c +++ b/source/blender/modifiers/intern/MOD_simpledeform.c @@ -351,10 +351,8 @@ static void SimpleDeformModifier_do(SimpleDeformModifierData *smd, simpleDeform_callback(smd_factor, deform_axis, dcut_remap, co_remap); /* apply deform */ copy_v3_v3_unmap(co, co_remap, axis_map); - interp_v3_v3v3(vertexCos[i], - vertexCos[i], - co, - weight); /* Use vertex weight has coef of linear interpolation */ + /* Use vertex weight has coef of linear interpolation */ + interp_v3_v3v3(vertexCos[i], vertexCos[i], co, weight); if (transf) { BLI_space_transform_invert(transf, vertexCos[i]); |