From 41d4a1986548e66a652221e4a68c52900474eeff Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 17 Apr 2019 08:24:14 +0200 Subject: ClangFormat: format '#if 0' code in source/ --- source/blender/modifiers/intern/MOD_armature.c | 2 +- source/blender/modifiers/intern/MOD_explode.c | 2 +- source/blender/modifiers/intern/MOD_particlesystem.c | 11 +++++++---- source/blender/modifiers/intern/MOD_screw.c | 3 --- source/blender/modifiers/intern/MOD_skin.c | 4 +--- source/blender/modifiers/intern/MOD_solidify.c | 11 +++++++---- source/blender/modifiers/intern/MOD_subsurf.c | 2 +- source/blender/modifiers/intern/MOD_uvproject.c | 2 +- source/blender/modifiers/intern/MOD_weightvgmix.c | 3 +-- 9 files changed, 20 insertions(+), 20 deletions(-) (limited to 'source/blender/modifiers/intern') diff --git a/source/blender/modifiers/intern/MOD_armature.c b/source/blender/modifiers/intern/MOD_armature.c index ce58fd172a2..6a01b01c0d9 100644 --- a/source/blender/modifiers/intern/MOD_armature.c +++ b/source/blender/modifiers/intern/MOD_armature.c @@ -55,7 +55,7 @@ static void initData(ModifierData *md) static void copyData(const ModifierData *md, ModifierData *target, const int flag) { #if 0 - const ArmatureModifierData *amd = (const ArmatureModifierData *) md; + const ArmatureModifierData *amd = (const ArmatureModifierData *)md; #endif ArmatureModifierData *tamd = (ArmatureModifierData *)target; diff --git a/source/blender/modifiers/intern/MOD_explode.c b/source/blender/modifiers/intern/MOD_explode.c index f126adbaafd..6109db3651c 100644 --- a/source/blender/modifiers/intern/MOD_explode.c +++ b/source/blender/modifiers/intern/MOD_explode.c @@ -63,7 +63,7 @@ static void freeData(ModifierData *md) static void copyData(const ModifierData *md, ModifierData *target, const int flag) { #if 0 - const ExplodeModifierData *emd = (const ExplodeModifierData *) md; + const ExplodeModifierData *emd = (const ExplodeModifierData *)md; #endif ExplodeModifierData *temd = (ExplodeModifierData *)target; diff --git a/source/blender/modifiers/intern/MOD_particlesystem.c b/source/blender/modifiers/intern/MOD_particlesystem.c index 547e5facbbe..8573ef14e09 100644 --- a/source/blender/modifiers/intern/MOD_particlesystem.c +++ b/source/blender/modifiers/intern/MOD_particlesystem.c @@ -69,7 +69,7 @@ static void freeData(ModifierData *md) static void copyData(const ModifierData *md, ModifierData *target, const int flag) { #if 0 - const ParticleSystemModifierData *psmd = (const ParticleSystemModifierData *) md; + const ParticleSystemModifierData *psmd = (const ParticleSystemModifierData *)md; #endif ParticleSystemModifierData *tpsmd = (ParticleSystemModifierData *)target; @@ -214,9 +214,12 @@ static void deformVerts(ModifierData *md, /* disabled particles in editmode for now, until support for proper evaluated mesh * updates is coded */ #if 0 -static void deformVertsEM( - ModifierData *md, Object *ob, BMEditMesh *editData, - Mesh *mesh, float (*vertexCos)[3], int numVerts) +static void deformVertsEM(ModifierData *md, + Object *ob, + BMEditMesh *editData, + Mesh *mesh, + float (*vertexCos)[3], + int numVerts) { const bool do_temp_mesh = (mesh == NULL); if (do_temp_mesh) { diff --git a/source/blender/modifiers/intern/MOD_screw.c b/source/blender/modifiers/intern/MOD_screw.c index e2917e2f82a..54db5bede8d 100644 --- a/source/blender/modifiers/intern/MOD_screw.c +++ b/source/blender/modifiers/intern/MOD_screw.c @@ -316,7 +316,6 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mes cross_v3_v3v3(c1, cross2, axis_vec); cross_v3_v3v3(c2, axis_vec, c1); - angle = angle_v3v3(cross1, c2); cross_v3_v3v3(axis_tmp, cross1, c2); @@ -324,7 +323,6 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mes if (len_v3v3(axis_tmp, axis_vec) > 1.0f) angle = -angle; - } } #endif @@ -1081,7 +1079,6 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mes ii = findEd(medge_new, maxEdges, ml_new[3].v, ml_new[0].v); printf("%d %d\n", ii, ml_new[3].e); ml_new[3].e = ii; - } } #endif diff --git a/source/blender/modifiers/intern/MOD_skin.c b/source/blender/modifiers/intern/MOD_skin.c index ffef1197491..78f628199d3 100644 --- a/source/blender/modifiers/intern/MOD_skin.c +++ b/source/blender/modifiers/intern/MOD_skin.c @@ -965,9 +965,7 @@ static void connect_frames(SkinOutput *so, BMVert *frame1[4], BMVert *frame2[4]) /* simple method, works mostly */ float p[3], no[3]; sub_v3_v3v3(p, q[3][0]->co, q[0][0]->co); - normal_quad_v3(no, - q[0][0]->co, q[0][1]->co, - q[0][2]->co, q[0][3]->co); + normal_quad_v3(no, q[0][0]->co, q[0][1]->co, q[0][2]->co, q[0][3]->co); swap = dot_v3v3(no, p) > 0; } #else diff --git a/source/blender/modifiers/intern/MOD_solidify.c b/source/blender/modifiers/intern/MOD_solidify.c index 9fb2e728dd9..0cf864fbf89 100644 --- a/source/blender/modifiers/intern/MOD_solidify.c +++ b/source/blender/modifiers/intern/MOD_solidify.c @@ -134,8 +134,8 @@ static void mesh_calc_hq_normal(Mesh *mesh, float (*poly_nors)[3], float (*r_ver #if 0 add_v3_v3v3(edge_normal, face_nors[edge_ref->f1], face_nors[edge_ref->f2]); normalize_v3_length( - edge_normal, - angle_normalized_v3v3(face_nors[edge_ref->f1], face_nors[edge_ref->f2])); + edge_normal, + angle_normalized_v3v3(face_nors[edge_ref->f1], face_nors[edge_ref->f2])); #else mid_v3_v3v3_angle_weighted( edge_normal, poly_nors[edge_ref->p1], poly_nors[edge_ref->p2]); @@ -455,8 +455,11 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mes ml2 = mloop + mp->loopstart + mesh->totloop; #if 0 for (j = 0; j < mp->totloop; j++) { - CustomData_copy_data(&mesh->ldata, &result->ldata, mp->loopstart + j, - mp->loopstart + (loop_end - j) + mesh->totloop, 1); + CustomData_copy_data(&mesh->ldata, + &result->ldata, + mp->loopstart + j, + mp->loopstart + (loop_end - j) + mesh->totloop, + 1); } #else /* slightly more involved, keep the first vertex the same for the copy, diff --git a/source/blender/modifiers/intern/MOD_subsurf.c b/source/blender/modifiers/intern/MOD_subsurf.c index c03b1761251..0b1249e263c 100644 --- a/source/blender/modifiers/intern/MOD_subsurf.c +++ b/source/blender/modifiers/intern/MOD_subsurf.c @@ -64,7 +64,7 @@ static void initData(ModifierData *md) static void copyData(const ModifierData *md, ModifierData *target, const int flag) { #if 0 - const SubsurfModifierData *smd = (const SubsurfModifierData *) md; + const SubsurfModifierData *smd = (const SubsurfModifierData *)md; #endif SubsurfModifierData *tsmd = (SubsurfModifierData *)target; diff --git a/source/blender/modifiers/intern/MOD_uvproject.c b/source/blender/modifiers/intern/MOD_uvproject.c index 5a9c115dc12..2ee0b36edc9 100644 --- a/source/blender/modifiers/intern/MOD_uvproject.c +++ b/source/blender/modifiers/intern/MOD_uvproject.c @@ -75,7 +75,7 @@ static void foreachObjectLink(ModifierData *md, Object *ob, ObjectWalkFunc walk, static void foreachIDLink(ModifierData *md, Object *ob, IDWalkFunc walk, void *userData) { #if 0 - UVProjectModifierData *umd = (UVProjectModifierData *) md; + UVProjectModifierData *umd = (UVProjectModifierData *)md; #endif foreachObjectLink(md, ob, (ObjectWalkFunc)walk, userData); diff --git a/source/blender/modifiers/intern/MOD_weightvgmix.c b/source/blender/modifiers/intern/MOD_weightvgmix.c index ed2c2e5e940..f41689b741c 100644 --- a/source/blender/modifiers/intern/MOD_weightvgmix.c +++ b/source/blender/modifiers/intern/MOD_weightvgmix.c @@ -55,8 +55,7 @@ static float mix_weight(float weight, float weight2, char mix_mode) * XXX Don't know why, but the switch version takes many CPU time, * and produces lag in realtime playback... */ - switch (mix_mode) - { + switch (mix_mode) { case MOD_WVG_MIX_ADD: return (weight + weight2); case MOD_WVG_MIX_SUB: -- cgit v1.2.3