Commit: 85de548e03fcaf657356382286a7ca6d6fbd30f3
Author: Campbell Barton
Date:   Mon Apr 16 17:08:27 2018 +0200
Branches: master
https://developer.blender.org/rB85de548e03fcaf657356382286a7ca6d6fbd30f3

Cleanup: indentation

===================================================================

M       source/blender/blenkernel/BKE_paint.h
M       source/blender/blenkernel/intern/boids.c
M       source/blender/blenkernel/intern/constraint.c
M       source/blender/blenkernel/intern/data_transfer.c
M       source/blender/blenkernel/intern/effect.c
M       source/blender/blenkernel/intern/particle_system.c
M       source/blender/blenkernel/intern/pointcache.c
M       source/blender/blenkernel/intern/smoke.c
M       source/blender/blenkernel/intern/softbody.c
M       source/blender/blenloader/intern/versioning_260.c
M       source/blender/bmesh/intern/bmesh_opdefines.c
M       source/blender/bmesh/operators/bmo_offset_edgeloops.c
M       source/blender/collada/AnimationImporter.cpp
M       source/blender/collada/EffectExporter.cpp
M       source/blender/collada/GeometryExporter.cpp
M       source/blender/collada/InstanceWriter.cpp
M       source/blender/collada/MaterialExporter.cpp
M       source/blender/collada/MeshImporter.cpp
M       source/blender/collada/collada_utils.cpp
M       source/blender/compositor/operations/COM_CompositorOperation.cpp
M       source/blender/editors/armature/editarmature_retarget.c
M       source/blender/editors/interface/resources.c
M       source/blender/editors/mesh/editmesh_knife.c
M       source/blender/editors/physics/particle_edit.c
M       source/blender/editors/screen/screen_ops.c
M       source/blender/editors/space_file/space_file.c
M       source/blender/editors/space_nla/nla_buttons.c
M       source/blender/editors/space_sequencer/sequencer_draw.c
M       source/blender/editors/transform/transform.c
M       source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
M       source/blender/makesrna/intern/rna_material.c
M       source/blender/render/intern/source/shadeoutput.c

===================================================================

diff --git a/source/blender/blenkernel/BKE_paint.h 
b/source/blender/blenkernel/BKE_paint.h
index c7a4f6b2fb6..285b9b3f99f 100644
--- a/source/blender/blenkernel/BKE_paint.h
+++ b/source/blender/blenkernel/BKE_paint.h
@@ -234,9 +234,8 @@ typedef struct SculptSession {
                        struct MDeformVert *dvert_prev;
                } wpaint;
 
-               //struct {
-               //ToDo: identify sculpt-only fields
-               //} sculpt;
+               /* TODO: identify sculpt-only fields */
+               // struct { ... } sculpt;
        } mode;
        int mode_type;
 
diff --git a/source/blender/blenkernel/intern/boids.c 
b/source/blender/blenkernel/intern/boids.c
index a2a242e7519..024c0aeb23f 100644
--- a/source/blender/blenkernel/intern/boids.c
+++ b/source/blender/blenkernel/intern/boids.c
@@ -161,8 +161,10 @@ static int rule_goal_avoid(BoidRule *rule, BoidBrainData 
*bbd, BoidValues *val,
                                copy_v3_v3(bbd->goal_nor, efd.nor);
                        }
                }
-               else if (rule->type == eBoidRuleType_Avoid && bpa->data.mode == 
eBoidMode_Climbing &&
-                       priority > 2.0f * gabr->fear_factor) {
+               else if ((rule->type == eBoidRuleType_Avoid) &&
+                        (bpa->data.mode == eBoidMode_Climbing) &&
+                        (priority > 2.0f * gabr->fear_factor))
+               {
                        /* detach from surface and try to fly away from danger 
*/
                        negate_v3_v3(efd.vec_to_point, bpa->gravity);
                }
@@ -1106,7 +1108,7 @@ void boid_brain(BoidBrainData *bbd, int p, ParticleData 
*pa)
 
                        /* jump to go faster */
                        if (jump == 0 && val.jump_speed > val.max_speed && 
bbd->wanted_speed > val.max_speed) {
-                               
+                               /* pass */
                        }
 
                        if (jump) {
diff --git a/source/blender/blenkernel/intern/constraint.c 
b/source/blender/blenkernel/intern/constraint.c
index 06817133382..28e4af32a71 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -2641,7 +2641,7 @@ static void distlimit_evaluate(bConstraint *con, 
bConstraintOb *cob, ListBase *t
                        /* if soft-distance is enabled, start fading once owner 
is dist+softdist from the target */
                        else if (data->flag & LIMITDIST_USESOFT) {
                                if (dist <= (data->dist + data->soft)) {
-                                       
+                                       /* pass */
                                }
                        }
                }
diff --git a/source/blender/blenkernel/intern/data_transfer.c 
b/source/blender/blenkernel/intern/data_transfer.c
index 3bc09c0173b..38340575e74 100644
--- a/source/blender/blenkernel/intern/data_transfer.c
+++ b/source/blender/blenkernel/intern/data_transfer.c
@@ -107,7 +107,7 @@ bool BKE_object_data_transfer_get_dttypes_capacity(
                }
 
                switch (dtdata_type) {
-               /* Vertex data */
+                       /* Vertex data */
                        case DT_TYPE_MDEFORMVERT:
                                *r_advanced_mixing = true;
                                *r_threshold = true;
@@ -120,7 +120,7 @@ bool BKE_object_data_transfer_get_dttypes_capacity(
                        case DT_TYPE_BWEIGHT_VERT:
                                ret = true;
                                break;
-               /* Edge data */
+                       /* Edge data */
                        case DT_TYPE_SHARP_EDGE:
                                *r_threshold = true;
                                ret = true;
@@ -139,7 +139,7 @@ bool BKE_object_data_transfer_get_dttypes_capacity(
                                *r_threshold = true;
                                ret = true;
                                break;
-               /* Loop/Poly data */
+                       /* Loop/Poly data */
                        case DT_TYPE_UV:
                                ret = true;
                                break;
diff --git a/source/blender/blenkernel/intern/effect.c 
b/source/blender/blenkernel/intern/effect.c
index 749c5897abb..e47af83e00e 100644
--- a/source/blender/blenkernel/intern/effect.c
+++ b/source/blender/blenkernel/intern/effect.c
@@ -504,28 +504,28 @@ float effector_falloff(EffectorCache *eff, EffectorData 
*efd, EffectedPoint *UNU
                falloff=0.0f;
        else {
                switch (eff->pd->falloff) {
-               case PFIELD_FALL_SPHERE:
-                       falloff*= falloff_func_dist(eff->pd, efd->distance);
-                       break;
-
-               case PFIELD_FALL_TUBE:
-                       falloff*= falloff_func_dist(eff->pd, ABS(fac));
-                       if (falloff == 0.0f)
+                       case PFIELD_FALL_SPHERE:
+                               falloff*= falloff_func_dist(eff->pd, 
efd->distance);
                                break;
 
-                       madd_v3_v3v3fl(temp, efd->vec_to_point2, efd->nor, 
-fac);
-                       r_fac= len_v3(temp);
-                       falloff*= falloff_func_rad(eff->pd, r_fac);
-                       break;
-               case PFIELD_FALL_CONE:
-                       falloff*= falloff_func_dist(eff->pd, ABS(fac));
-                       if (falloff == 0.0f)
+                       case PFIELD_FALL_TUBE:
+                               falloff*= falloff_func_dist(eff->pd, ABS(fac));
+                               if (falloff == 0.0f)
+                                       break;
+
+                               madd_v3_v3v3fl(temp, efd->vec_to_point2, 
efd->nor, -fac);
+                               r_fac= len_v3(temp);
+                               falloff*= falloff_func_rad(eff->pd, r_fac);
                                break;
+                       case PFIELD_FALL_CONE:
+                               falloff*= falloff_func_dist(eff->pd, ABS(fac));
+                               if (falloff == 0.0f)
+                                       break;
 
-                       r_fac= RAD2DEGF(saacos(fac/len_v3(efd->vec_to_point)));
-                       falloff*= falloff_func_rad(eff->pd, r_fac);
+                               r_fac= 
RAD2DEGF(saacos(fac/len_v3(efd->vec_to_point)));
+                               falloff*= falloff_func_rad(eff->pd, r_fac);
 
-                       break;
+                               break;
                }
        }
 
diff --git a/source/blender/blenkernel/intern/particle_system.c 
b/source/blender/blenkernel/intern/particle_system.c
index 8aeeee5a1ad..94c1dd0c7c3 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -535,18 +535,20 @@ static void 
initialize_particle_texture(ParticleSimulationData *sim, ParticleDat
        psys_get_texture(sim, pa, &ptex, PAMAP_INIT, 0.f);
        
        switch (part->type) {
-       case PART_EMITTER:
-               if (ptex.exist < psys_frand(psys, p+125))
-                       pa->flag |= PARS_UNEXIST;
-               pa->time = part->sta + (part->end - part->sta)*ptex.time;
-               break;
-       case PART_HAIR:
-               if (ptex.exist < psys_frand(psys, p+125))
-                       pa->flag |= PARS_UNEXIST;
-               pa->time = 0.f;
-               break;
-       case PART_FLUID:
-               break;
+               case PART_EMITTER:
+                       if (ptex.exist < psys_frand(psys, p + 125)) {
+                               pa->flag |= PARS_UNEXIST;
+                       }
+                       pa->time = part->sta + (part->end - 
part->sta)*ptex.time;
+                       break;
+               case PART_HAIR:
+                       if (ptex.exist < psys_frand(psys, p + 125)) {
+                               pa->flag |= PARS_UNEXIST;
+                       }
+                       pa->time = 0.f;
+                       break;
+               case PART_FLUID:
+                       break;
        }
 }
 
@@ -1059,8 +1061,10 @@ void reset_particle(ParticleSimulationData *sim, 
ParticleData *pa, float dtime,
 
        pa->dietime = pa->time + pa->lifetime;
 
-       if (sim->psys->pointcache && sim->psys->pointcache->flag & 
PTCACHE_BAKED &&
-               sim->psys->pointcache->mem_cache.first) {
+       if ((sim->psys->pointcache) &&
+           (sim->psys->pointcache->flag & PTCACHE_BAKED) &&
+           (sim->psys->pointcache->mem_cache.first))
+       {
                float dietime = 
psys_get_dietime_from_cache(sim->psys->pointcache, p);
                pa->dietime = MIN2(pa->dietime, dietime);
        }
@@ -3684,11 +3688,11 @@ static void dynamics_step(ParticleSimulationData *sim, 
float cfra)
                                /* Note that we could avoid copying sphdata for 
each thread here (it's only read here),
                                 * but doubt this would gain us anything except 
confusion... */
                                {
-                               ParallelRangeSettings settings;
-                               BLI_parallel_range_settings_defaults(&settings);
-                               settings.use_threading = (psys->totpart > 100);
-                               settings.userdata_chunk = &sphdata;
-                               settings.userdata_chunk_size = sizeof(sphdata);
+                                       ParallelRangeSettings settings;
+                                       
BLI_parallel_range_settings_defaults(&settings);
+                                       settings.use_threading = (psys->totpart 
> 100);
+                                       settings.userdata_chunk = &sphdata;
+                                       settings.userdata_chunk_size = 
sizeof(sphdata);
                                        BLI_task_parallel_range(
                                                0, psys->totpart,
                                                &task_data,
@@ -3698,11 +3702,11 @@ static void dynamics_step(ParticleSimulationData *sim, 
float cfra)
 
                                /* do global forces & effectors */
                                {
-                               ParallelRangeSettings settings;
-                               BLI_parallel_range_settings_defaults(&settings);
-                               settings.use_threading = (psys->totpart > 100);
-                               settings.userdata_chunk = &sphdata;
-                               settings.userdata_chunk_size = sizeof(sphdata);
+                                       ParallelRangeSettings settings;
+                                       
BLI_parallel_range_settings_defaults(&settings);
+                                       settings.use_threading = (psys->totpart 
> 100);
+                                       settings.userdata_chunk = &sphdata;
+                                       settings.userdata_chunk_size = 
sizeof(sphdata);
                                        BLI_task_parallel_range(
                                                0, psys->totpart,
                                                &task_data,
diff --git a/source/blender/blenkernel/intern/pointcache.c 
b/source/blender/blenkernel/intern/pointcache.c
index 5b36b0f9f84..89885bdca26 100644
--- a/source/blender/blenkernel/intern/pointcache.c
+++ b/source/blender/blenkernel/intern/pointcache.c
@@ -440,9 +440,9 @@ static void ptcache_particle_extra_write(void *psys_v, 
PTCacheMem *pm, int UNUSE
        PTCacheExtra *extra = NULL;
 
        if (psys->part->phystype == PART_PHYS_FLUID &&
-               psys->part->fluid && psys->part->fluid->flag & 
SPH_VISCOELASTIC_SPRINGS &&
-               psys->tot_fluidsprings && psys->fluid_springs) {
-
+           psys->part->fluid && psys->part->fluid->flag & 
SPH_VISCOELASTIC_SPRINGS &&
+           psys->tot_fluidsprings && psys->fluid_springs)
+       {
                extra = MEM_callocN(sizeof(PTCacheExtra), "Point cache: fluid 
extra data");
 
                extra->type = BPHYS_EXTRA_FLUID_SPRINGS;
@@ -789,8 +789,9 @@ static int ptcache_smoke_read(PTCacheFile *pf, void 
*smoke_v)
 
        /* check if resolution has changed */
        if (sds->res[0] != ch_res[0] ||
-               sds->res[1] != ch_res[1] ||
-               sds->res[2] != ch_res[2]) {
+           sds->res[1] != ch_res[1] ||
+           sds->res[2] != ch_res[2])
+       {
                if (sds->flags & MOD_SMOKE_ADAPTIVE_DOMAIN)
                        reallocate = 1;
                else
@@ -2197,8 +2198,8 @@ static void ptcache_data_copy(void *from[], void *to[])
 {
        int i;
        for (i=0; i<BPHYS_TOT_DATA; i++) {
-       /* note, durian file 03.4b_comp crashes if to[i] is not tested
-        * its NULL, not sure if this should be fixed elsewhere but for now its 
needed */
+               /* note, durian file 03.4b_comp crashes if to[i] is not tested
+                * its NULL, not sure if this should be fixed elsewhere but for 
now its needed */
                if (from[i] && to[i])
                        memcpy(to[i], from[i], ptcache_data_size[i]);
        }
diff --git a/source/blender/blenkernel/intern/smoke.c 
b/source/blender/blenkernel/intern/smoke.c
index e12b981a8f9..0ea4007c95f 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -1105,8 +1105,9 @@ static void em_combineMaps(EmissionMap *output, 
EmissionMap *em2, int hires_mult
 
                                /* initialize with first input if in range */
                                if (x >= em1.min[0] && x < em1.max[0] &&
-                                       y >= em1.min[1] && y < em1.max[1] &&
-                                       z >= em1.min[2] && z < em1.max[2]) {
+                                   y >= em1.min[1] && y < em1.max[1] &&
+                                   z >= em1.min[2] && z < em1.max[2])
+                               {
                                        int index_in = smoke_get_index(x - 
em1.min[0], em1

@@ Diff output truncated at 10240 characters. @@

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to