diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-07-10 07:41:19 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-07-10 07:41:19 +0300 |
commit | e927ce8acb6848974077fbbd6dc110dd3948b48a (patch) | |
tree | 7b955f22aa42f1eaf0d6bd88aff202c3a2f41f9f /source/blender/blenkernel/intern | |
parent | 91b8e57d653a1dce80f4e7c83ddfd0b596020590 (diff) |
Cleanup: avoid line breaks from trailing comments
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/curve.c | 13 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 5 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/smoke.c | 4 |
3 files changed, 12 insertions, 10 deletions
diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c index 8a2450efa55..931c0ed73d3 100644 --- a/source/blender/blenkernel/intern/curve.c +++ b/source/blender/blenkernel/intern/curve.c @@ -1818,8 +1818,9 @@ void BKE_curve_bevel_make(Object *ob, ListBase *disp) fp[3] = fp[4] = 0.0; fp[5] = cu->ext1; } - else if ((cu->flag & (CU_FRONT | CU_BACK)) == 0 && - cu->ext1 == 0.0f) { /* we make a full round bevel in that case */ + else if ((cu->flag & (CU_FRONT | CU_BACK)) == 0 && cu->ext1 == 0.0f) { + /* We make a full round bevel in that case. */ + nr = 4 + 2 * cu->bevresol; dl = MEM_callocN(sizeof(DispList), "makebevelcurve p1"); @@ -4742,8 +4743,8 @@ bool BKE_nurb_check_valid_u(const Nurb *nu) if (nu->pntsu < nu->orderu) { return false; } - if (((nu->flagu & CU_NURB_CYCLIC) == 0) && - (nu->flagu & CU_NURB_BEZIER)) { /* Bezier U Endpoints */ + if (((nu->flagu & CU_NURB_CYCLIC) == 0) && (nu->flagu & CU_NURB_BEZIER)) { + /* Bezier U Endpoints */ if (nu->orderu == 4) { if (nu->pntsu < 5) { return false; /* bezier with 4 orderu needs 5 points */ @@ -4769,8 +4770,8 @@ bool BKE_nurb_check_valid_v(const Nurb *nu) if (nu->pntsv < nu->orderv) { return false; } - if (((nu->flagv & CU_NURB_CYCLIC) == 0) && - (nu->flagv & CU_NURB_BEZIER)) { /* Bezier V Endpoints */ + if (((nu->flagv & CU_NURB_CYCLIC) == 0) && (nu->flagv & CU_NURB_BEZIER)) { + /* Bezier V Endpoints */ if (nu->orderv == 4) { if (nu->pntsv < 5) { return false; /* bezier with 4 orderu needs 5 points */ diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index e6fbc386b77..04164de91ca 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -558,8 +558,9 @@ void BKE_mesh_copy_data(Main *bmain, Mesh *me_dst, const Mesh *me_src, const int /* XXX WHAT? Why? Comment, please! And pretty sure this is not valid for regular Mesh copying? */ me_dst->runtime.is_original = false; - const bool do_tessface = ((me_src->totface != 0) && - (me_src->totpoly == 0)); /* only do tessface if we have no polys */ + /* Only do tessface if we have no polys. */ + const bool do_tessface = ((me_src->totface != 0) && (me_src->totpoly == 0)); + CustomData_MeshMasks mask = CD_MASK_MESH; if (me_src->id.tag & LIB_TAG_NO_MAIN) { diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index d6858e2d4d2..bb8fd18ea58 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -1402,9 +1402,9 @@ static void emit_from_particles(Object *flow_ob, Scene *scene, float dt) { + /* Is particle system selected. */ if (sfs && sfs->psys && sfs->psys->part && - ELEM(sfs->psys->part->type, PART_EMITTER, PART_FLUID)) // is particle system selected - { + ELEM(sfs->psys->part->type, PART_EMITTER, PART_FLUID)) { ParticleSimulationData sim; ParticleSystem *psys = sfs->psys; float *particle_pos; |