diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-03-17 14:48:13 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-03-17 14:48:13 +0400 |
commit | 8480bb64ec7e5f367b914dc46e9c929945a6ebb0 (patch) | |
tree | 3c7a2982a001dd9efb9b99115454576906815637 | |
parent | 930765faa81efe3894e5476a59f5f3298da54ae4 (diff) |
Code cleanup: style
-rw-r--r-- | intern/cycles/app/cycles_xml.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/blender/blender_mesh.cpp | 2 | ||||
-rw-r--r-- | intern/guardedalloc/intern/mallocn.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/cloth.c | 11 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/displist.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/implicit.c | 21 | ||||
-rw-r--r-- | source/blender/editors/curve/editcurve.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_file/file_ops.c | 2 | ||||
-rw-r--r-- | source/blender/editors/uvedit/uvedit_smart_stitch.c | 2 | ||||
-rw-r--r-- | source/blender/render/intern/source/render_texture.c | 4 |
10 files changed, 27 insertions, 25 deletions
diff --git a/intern/cycles/app/cycles_xml.cpp b/intern/cycles/app/cycles_xml.cpp index 10bcbf6a63e..998531a577b 100644 --- a/intern/cycles/app/cycles_xml.cpp +++ b/intern/cycles/app/cycles_xml.cpp @@ -877,7 +877,7 @@ static void xml_read_mesh(const XMLReadState& state, pugi::xml_node node) SubdParams sdparams(mesh, shader, smooth); xml_read_float(&sdparams.dicing_rate, node, "dicing_rate"); - DiagSplit dsplit(sdparams);; + DiagSplit dsplit(sdparams); sdmesh.tessellate(&dsplit); } else { diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp index 61c6ef6af1b..0972cf6a939 100644 --- a/intern/cycles/blender/blender_mesh.cpp +++ b/intern/cycles/blender/blender_mesh.cpp @@ -414,7 +414,7 @@ static void create_subd_mesh(Scene *scene, Mesh *mesh, BL::Mesh b_mesh, PointerR //sdparams.camera = scene->camera; /* tesselate */ - DiagSplit dsplit(sdparams);; + DiagSplit dsplit(sdparams); sdmesh.tessellate(&dsplit); } diff --git a/intern/guardedalloc/intern/mallocn.c b/intern/guardedalloc/intern/mallocn.c index 2ac01a6c7e4..4d00616202e 100644 --- a/intern/guardedalloc/intern/mallocn.c +++ b/intern/guardedalloc/intern/mallocn.c @@ -43,7 +43,7 @@ size_t (*MEM_allocN_len)(const void *vmemh) = MEM_lockfree_allocN_len; void (*MEM_freeN)(void *vmemh) = MEM_lockfree_freeN; void *(*MEM_dupallocN)(const void *vmemh) = MEM_lockfree_dupallocN; void *(*MEM_reallocN_id)(void *vmemh, size_t len, const char *str) = MEM_lockfree_reallocN_id; -void *(*MEM_recallocN_id)(void *vmemh, size_t len, const char *str) = MEM_lockfree_recallocN_id;; +void *(*MEM_recallocN_id)(void *vmemh, size_t len, const char *str) = MEM_lockfree_recallocN_id; void *(*MEM_callocN)(size_t len, const char *str) = MEM_lockfree_callocN; void *(*MEM_mallocN)(size_t len, const char *str) = MEM_lockfree_mallocN; void *(*MEM_mapallocN)(size_t len, const char *str) = MEM_lockfree_mapallocN; @@ -71,7 +71,7 @@ void MEM_use_guarded_allocator(void) MEM_freeN = MEM_guarded_freeN; MEM_dupallocN = MEM_guarded_dupallocN; MEM_reallocN_id = MEM_guarded_reallocN_id; - MEM_recallocN_id = MEM_guarded_recallocN_id;; + MEM_recallocN_id = MEM_guarded_recallocN_id; MEM_callocN = MEM_guarded_callocN; MEM_mallocN = MEM_guarded_mallocN; MEM_mapallocN = MEM_guarded_mapallocN; diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c index 3ab522ac24b..220ceb81d44 100644 --- a/source/blender/blenkernel/intern/cloth.c +++ b/source/blender/blenkernel/intern/cloth.c @@ -1149,13 +1149,14 @@ static int cloth_build_springs ( ClothModifierData *clmd, DerivedMesh *dm ) if ( spring ) { spring_verts_ordered_set(spring, medge[i].v1, medge[i].v2); - if(clmd->sim_parms->flags & CLOTH_SIMSETTINGS_FLAG_SEW && medge[i].flag & ME_LOOSEEDGE) { + if (clmd->sim_parms->flags & CLOTH_SIMSETTINGS_FLAG_SEW && medge[i].flag & ME_LOOSEEDGE) { // handle sewing (loose edges will be pulled together) spring->restlen = 0.0f; spring->stiffness = 1.0f; spring->type = CLOTH_SPRING_TYPE_SEWING; - } else { - if(clmd->sim_parms->vgroup_shrink > 0) + } + else { + if (clmd->sim_parms->vgroup_shrink > 0) shrink_factor = 1.0f - ((cloth->verts[spring->ij].shrink_factor + cloth->verts[spring->kl].shrink_factor) / 2.0f); else shrink_factor = 1.0f - clmd->sim_parms->shrink_min; @@ -1200,7 +1201,7 @@ static int cloth_build_springs ( ClothModifierData *clmd, DerivedMesh *dm ) } spring_verts_ordered_set(spring, mface[i].v1, mface[i].v3); - if(clmd->sim_parms->vgroup_shrink > 0) + if (clmd->sim_parms->vgroup_shrink > 0) shrink_factor = 1.0f - ((cloth->verts[spring->ij].shrink_factor + cloth->verts[spring->kl].shrink_factor) / 2.0f); else shrink_factor = 1.0f - clmd->sim_parms->shrink_min; @@ -1224,7 +1225,7 @@ static int cloth_build_springs ( ClothModifierData *clmd, DerivedMesh *dm ) } spring_verts_ordered_set(spring, mface[i].v2, mface[i].v4); - if(clmd->sim_parms->vgroup_shrink > 0) + if (clmd->sim_parms->vgroup_shrink > 0) shrink_factor = 1.0f - ((cloth->verts[spring->ij].shrink_factor + cloth->verts[spring->kl].shrink_factor) / 2.0f); else shrink_factor = 1.0f - clmd->sim_parms->shrink_min; diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c index f3fa5f75dbb..b5f631648ea 100644 --- a/source/blender/blenkernel/intern/displist.c +++ b/source/blender/blenkernel/intern/displist.c @@ -596,7 +596,7 @@ static void bevels_to_filledpoly(Curve *cu, ListBase *dispbase) while (dl) { if (dl->type == DL_SURF) { if ((dl->flag & DL_CYCL_V) && (dl->flag & DL_CYCL_U) == 0) { - if ( (cu->flag & CU_BACK) && (dl->flag & DL_BACK_CURVE)) { + if ((cu->flag & CU_BACK) && (dl->flag & DL_BACK_CURVE)) { dlnew = MEM_callocN(sizeof(DispList), "filldisp"); BLI_addtail(&front, dlnew); dlnew->verts = fp1 = MEM_mallocN(sizeof(float) * 3 * dl->parts, "filldisp1"); diff --git a/source/blender/blenkernel/intern/implicit.c b/source/blender/blenkernel/intern/implicit.c index 08959850fb9..cceb7925194 100644 --- a/source/blender/blenkernel/intern/implicit.c +++ b/source/blender/blenkernel/intern/implicit.c @@ -1271,16 +1271,17 @@ DO_INLINE void cloth_calc_spring_force(ClothModifierData *clmd, ClothSpring *s, k = scaling / (clmd->sim_parms->avg_spring_len + FLT_EPSILON); // TODO: verify, half verified (couldn't see error) - if(s->type & CLOTH_SPRING_TYPE_SEWING) { - // sewing springs usually have a large distance at first so clamp the force so we don't get tunnelling through colission objects - float force = k*(length-L); - if(force > clmd->sim_parms->max_sewing) { - force = clmd->sim_parms->max_sewing; - } - mul_fvector_S(stretch_force, dir, force); - } else { - mul_fvector_S(stretch_force, dir, k*(length-L)); - } + if (s->type & CLOTH_SPRING_TYPE_SEWING) { + // sewing springs usually have a large distance at first so clamp the force so we don't get tunnelling through colission objects + float force = k*(length-L); + if (force > clmd->sim_parms->max_sewing) { + force = clmd->sim_parms->max_sewing; + } + mul_fvector_S(stretch_force, dir, force); + } + else { + mul_fvector_S(stretch_force, dir, k * (length - L)); + } VECADD(s->f, s->f, stretch_force); diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index 31c91ad01eb..db233c6753b 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -4369,7 +4369,7 @@ static int make_segment_exec(bContext *C, wmOperator *op) if (isNurbsel_count(cu, nu) == 1) { /* only 1 selected, not first or last, a little complex, but intuitive */ if (nu->pntsv == 1) { - if ( (nu->bp->f1 & SELECT) || (nu->bp[nu->pntsu - 1].f1 & SELECT)) { + if ((nu->bp->f1 & SELECT) || (nu->bp[nu->pntsu - 1].f1 & SELECT)) { /* pass */ } else { diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c index 94f6174de65..4a298e183e6 100644 --- a/source/blender/editors/space_file/file_ops.c +++ b/source/blender/editors/space_file/file_ops.c @@ -494,7 +494,7 @@ static int bookmark_delete_exec(bContext *C, wmOperator *op) if (RNA_struct_find_property(op->ptr, "index")) { int index = RNA_int_get(op->ptr, "index"); - if ( (index > -1) && (index < nentries)) { + if ((index > -1) && (index < nentries)) { char name[FILE_MAX]; fsmenu_remove_entry(fsmenu, FS_CATEGORY_BOOKMARKS, index); diff --git a/source/blender/editors/uvedit/uvedit_smart_stitch.c b/source/blender/editors/uvedit/uvedit_smart_stitch.c index 3af947b472e..d8a66979565 100644 --- a/source/blender/editors/uvedit/uvedit_smart_stitch.c +++ b/source/blender/editors/uvedit/uvedit_smart_stitch.c @@ -882,7 +882,7 @@ static void stitch_propagate_uv_final_position(Scene *scene, } /* end of calculations, keep only the selection flag */ - if ( (!state->snap_islands) || ((!state->midpoints) && (element_iter->island == state->static_island))) { + if ((!state->snap_islands) || ((!state->midpoints) && (element_iter->island == state->static_island))) { element_iter->flag &= STITCH_SELECTED; } diff --git a/source/blender/render/intern/source/render_texture.c b/source/blender/render/intern/source/render_texture.c index 2718d2090cd..ce1f1467393 100644 --- a/source/blender/render/intern/source/render_texture.c +++ b/source/blender/render/intern/source/render_texture.c @@ -2321,7 +2321,7 @@ void do_material_tex(ShadeInput *shi, Render *re) /* texture output */ - if ( (rgbnor & TEX_RGB) && (mtex->texflag & MTEX_RGBTOINT)) { + if ((rgbnor & TEX_RGB) && (mtex->texflag & MTEX_RGBTOINT)) { texres.tin = rgb_to_grayscale(&texres.tr); rgbnor -= TEX_RGB; } @@ -2759,7 +2759,7 @@ void do_volume_tex(ShadeInput *shi, const float *xyz, int mapto_flag, float col_ /* texture output */ - if ( (rgbnor & TEX_RGB) && (mtex->texflag & MTEX_RGBTOINT)) { + if ((rgbnor & TEX_RGB) && (mtex->texflag & MTEX_RGBTOINT)) { texres.tin = rgb_to_grayscale(&texres.tr); rgbnor -= TEX_RGB; } |