diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-03-23 13:51:19 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-03-23 13:51:19 +0300 |
commit | 7cc2b27099b7435cc1a29a48ae0e4c8335d811f3 (patch) | |
tree | 5cce202b18d5d41db0cac708d46195959ab15050 /source/blender/blenkernel | |
parent | f2f32c81d42833d68605851510efb2f82acbbff7 (diff) |
Cleanup: stray tabs
Tabs in middle of code (mostly for no reason / by accident).
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/cloth.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/collision.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/dynamicpaint.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mesh_validate.c | 18 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/packedFile.c | 11 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/paint.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/particle_distribute.c | 8 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/screen.c | 2 |
8 files changed, 25 insertions, 26 deletions
diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c index dd93606a67c..e1717f60a0f 100644 --- a/source/blender/blenkernel/intern/cloth.c +++ b/source/blender/blenkernel/intern/cloth.c @@ -640,7 +640,7 @@ void cloth_free_modifier_extern(ClothModifierData *clmd ) **/ static void cloth_to_object (Object *ob, ClothModifierData *clmd, float (*vertexCos)[3]) { - unsigned int i = 0; + unsigned int i = 0; Cloth *cloth = clmd->clothObject; if (clmd->clothObject) { diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c index bd336016838..65742df754e 100644 --- a/source/blender/blenkernel/intern/collision.c +++ b/source/blender/blenkernel/intern/collision.c @@ -178,8 +178,8 @@ static void collision_compute_barycentric ( float pv[3], float p1[3], float p2[3 /* dot_v3v3 */ #define INPR(v1, v2) ( (v1)[0] * (v2)[0] + (v1)[1] * (v2)[1] + (v1)[2] * (v2)[2]) - double tempV1[3], tempV2[3], tempV4[3]; - double a, b, c, d, e, f; + double tempV1[3], tempV2[3], tempV4[3]; + double a, b, c, d, e, f; VECSUB ( tempV1, p1, p3 ); VECSUB ( tempV2, p2, p3 ); diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index 011e58b2349..3a70a4233b8 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -54,7 +54,7 @@ #include "BKE_animsys.h" #include "BKE_armature.h" -#include "BKE_bvhutils.h" /* bvh tree */ +#include "BKE_bvhutils.h" /* bvh tree */ #include "BKE_colorband.h" #include "BKE_cdderivedmesh.h" #include "BKE_constraint.h" @@ -4518,7 +4518,7 @@ static int dynamicPaint_paintParticles(DynamicPaintSurface *surface, */ tree = BLI_kdtree_new(psys->totpart); - /* loop through particles and insert valid ones to the tree */ + /* loop through particles and insert valid ones to the tree */ p = 0; for (ParticleData *pa = psys->particles; p < psys->totpart; p++, pa++) { /* Proceed only if particle is active */ diff --git a/source/blender/blenkernel/intern/mesh_validate.c b/source/blender/blenkernel/intern/mesh_validate.c index 62c9210b8f5..b0577fdd50d 100644 --- a/source/blender/blenkernel/intern/mesh_validate.c +++ b/source/blender/blenkernel/intern/mesh_validate.c @@ -62,8 +62,8 @@ typedef union { } EdgeUUID; typedef struct SortFace { - EdgeUUID es[4]; - unsigned int index; + EdgeUUID es[4]; + unsigned int index; } SortFace; /* Used to detect polys (faces) using exactly the same vertices. */ @@ -126,28 +126,28 @@ static int search_face_cmp(const void *v1, const void *v2) if (sfa->es[0].edval > sfb->es[0].edval) { return 1; } - else if (sfa->es[0].edval < sfb->es[0].edval) { + else if (sfa->es[0].edval < sfb->es[0].edval) { return -1; } - else if (sfa->es[1].edval > sfb->es[1].edval) { + else if (sfa->es[1].edval > sfb->es[1].edval) { return 1; } - else if (sfa->es[1].edval < sfb->es[1].edval) { + else if (sfa->es[1].edval < sfb->es[1].edval) { return -1; } - else if (sfa->es[2].edval > sfb->es[2].edval) { + else if (sfa->es[2].edval > sfb->es[2].edval) { return 1; } - else if (sfa->es[2].edval < sfb->es[2].edval) { + else if (sfa->es[2].edval < sfb->es[2].edval) { return -1; } - else if (sfa->es[3].edval > sfb->es[3].edval) { + else if (sfa->es[3].edval > sfb->es[3].edval) { return 1; } - else if (sfa->es[3].edval < sfb->es[3].edval) { + else if (sfa->es[3].edval < sfb->es[3].edval) { return -1; } diff --git a/source/blender/blenkernel/intern/packedFile.c b/source/blender/blenkernel/intern/packedFile.c index 35e2531675d..f17c10765b8 100644 --- a/source/blender/blenkernel/intern/packedFile.c +++ b/source/blender/blenkernel/intern/packedFile.c @@ -354,16 +354,15 @@ int writePackedFile(ReportList *reports, const char *filename, PackedFile *pf, i return (ret_value); } - -/* + +/** * This function compares a packed file to a 'real' file. * It returns an integer indicating if: * - * PF_EQUAL - the packed file and original file are identical - * PF_DIFFERENT - the packed file and original file differ - * PF_NOFILE - the original file doens't exist + * - PF_EQUAL: the packed file and original file are identical + * - PF_DIFFERENT: the packed file and original file differ + * - PF_NOFILE: the original file doens't exist */ - int checkPackedFile(const char *filename, PackedFile *pf) { BLI_stat_t st; diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c index 593c769e8e9..d0bf1bed4f4 100644 --- a/source/blender/blenkernel/intern/paint.c +++ b/source/blender/blenkernel/intern/paint.c @@ -898,7 +898,7 @@ void BKE_sculpt_update_mesh_elements(Scene *scene, Sculpt *sd, Object *ob, if (!CustomData_has_layer(&me->ldata, CD_GRID_PAINT_MASK)) { #if 1 BKE_sculpt_mask_layers_ensure(ob, mmd); -#else /* if we wanted to support adding mask data while multi-res painting, we would need to do this */ +#else /* if we wanted to support adding mask data while multi-res painting, we would need to do this */ if ((ED_sculpt_mask_layers_ensure(ob, mmd) & ED_SCULPT_MASK_LAYER_CALC_LOOP)) { /* remake the derived mesh */ ob->recalc |= OB_RECALC_DATA; diff --git a/source/blender/blenkernel/intern/particle_distribute.c b/source/blender/blenkernel/intern/particle_distribute.c index 0561af8507d..bcb2b770db3 100644 --- a/source/blender/blenkernel/intern/particle_distribute.c +++ b/source/blender/blenkernel/intern/particle_distribute.c @@ -803,7 +803,7 @@ static void distribute_invalid(Scene *scene, ParticleSystem *psys, int from) } } -/* Creates a distribution of coordinates on a DerivedMesh */ +/* Creates a distribution of coordinates on a DerivedMesh */ /* This is to denote functionality that does not yet work with mesh - only derived mesh */ static int psys_thread_context_init_distribute(ParticleThreadContext *ctx, ParticleSimulationData *sim, int from) { @@ -953,9 +953,9 @@ static int psys_thread_context_init_distribute(ParticleThreadContext *ctx, Parti return 0; } - element_weight = MEM_callocN(sizeof(float)*totelem, "particle_distribution_weights"); - particle_element= MEM_callocN(sizeof(int)*totpart, "particle_distribution_indexes"); - jitter_offset = MEM_callocN(sizeof(float)*totelem, "particle_distribution_jitoff"); + element_weight = MEM_callocN(sizeof(float) * totelem, "particle_distribution_weights"); + particle_element = MEM_callocN(sizeof(int) * totpart, "particle_distribution_indexes"); + jitter_offset = MEM_callocN(sizeof(float) * totelem, "particle_distribution_jitoff"); /* Calculate weights from face areas */ if ((part->flag&PART_EDISTR || children) && from != PART_FROM_VERT) { diff --git a/source/blender/blenkernel/intern/screen.c b/source/blender/blenkernel/intern/screen.c index 78caf1fe1f3..2b1cf0a01df 100644 --- a/source/blender/blenkernel/intern/screen.c +++ b/source/blender/blenkernel/intern/screen.c @@ -620,7 +620,7 @@ void BKE_screen_view3d_twmode_remove(View3D *v3d, const int i) { const int selected_index = (v3d->twmode - V3D_MANIP_CUSTOM); if (selected_index == i) { - v3d->twmode = V3D_MANIP_GLOBAL; /* fallback to global */ + v3d->twmode = V3D_MANIP_GLOBAL; /* fallback to global */ } else if (selected_index > i) { v3d->twmode--; |