Cleanup: indentation
authorCampbell Barton <ideasman42@gmail.com>
Mon, 16 Apr 2018 15:08:27 +0000 (17:08 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 16 Apr 2018 15:08:27 +0000 (17:08 +0200)
32 files changed:
source/blender/blenkernel/BKE_paint.h
source/blender/blenkernel/intern/boids.c
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/data_transfer.c
source/blender/blenkernel/intern/effect.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenkernel/intern/pointcache.c
source/blender/blenkernel/intern/smoke.c
source/blender/blenkernel/intern/softbody.c
source/blender/blenloader/intern/versioning_260.c
source/blender/bmesh/intern/bmesh_opdefines.c
source/blender/bmesh/operators/bmo_offset_edgeloops.c
source/blender/collada/AnimationImporter.cpp
source/blender/collada/EffectExporter.cpp
source/blender/collada/GeometryExporter.cpp
source/blender/collada/InstanceWriter.cpp
source/blender/collada/MaterialExporter.cpp
source/blender/collada/MeshImporter.cpp
source/blender/collada/collada_utils.cpp
source/blender/compositor/operations/COM_CompositorOperation.cpp
source/blender/editors/armature/editarmature_retarget.c
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_knife.c
source/blender/editors/physics/particle_edit.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_file/space_file.c
source/blender/editors/space_nla/nla_buttons.c
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/editors/transform/transform.c
source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
source/blender/makesrna/intern/rna_material.c
source/blender/render/intern/source/shadeoutput.c

index c7a4f6b2fb6417d0c215fa9ade7d013f1a9ac20e..285b9b3f99f9b5a6439e5e9ed935999bb227b50a 100644 (file)
@@ -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;
 
index a2a242e7519acef4198a04dc3f918dc7bb53cf9b..024c0aeb23fb7f2fe3010840e2c4cd22539403c6 100644 (file)
@@ -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) {
index 068171333824a47c5421b52ca4363102803e4309..28e4af32a71ef16e171de4e61c66220133053585 100644 (file)
@@ -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 */
                                }
                        }
                }
index 3bc09c0173b721fa4db3442381791a21544aa648..38340575e74f8c946efa3dcb18b55e637f98efd7 100644 (file)
@@ -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;
index 749c5897abbded3f4b1976e1c6acb2441493563b..e47af83e00eb21dba754ff307bca68b34085de9f 100644 (file)
@@ -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;
                }
        }
 
index 8aeeee5a1ad823539b181d46fc81906d105c70e9..94c1dd0c7c33fa1fd202a6b32a2383b6be29f80f 100644 (file)
@@ -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,
index 5b36b0f9f84b070ac791583f76c6e4aa2a14d528..89885bdca26db09b25502d13059311e25e37c132 100644 (file)
@@ -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]);
        }
index e12b981a8f999460e67bed40225ea816f300b1fb..0ea4007c95f9dd529b013e9020ad43c0cfffe8df 100644 (file)
@@ -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.res[0], y - em1.min[1], em1.res[1], z - em1.min[2]);
 
                                        /* values */
@@ -1118,8 +1119,9 @@ static void em_combineMaps(EmissionMap *output, EmissionMap *em2, int hires_mult
 
                                /* apply second input if in range */
                                if (x >= em2->min[0] && x < em2->max[0] &&
-                                       y >= em2->min[1] && y < em2->max[1] &&
-                                       z >= em2->min[2] && z < em2->max[2]) {
+                                   y >= em2->min[1] && y < em2->max[1] &&
+                                   z >= em2->min[2] && z < em2->max[2])
+                               {
                                        int index_in = smoke_get_index(x - em2->min[0], em2->res[0], y - em2->min[1], em2->res[1], z - em2->min[2]);
 
                                        /* values */
@@ -1149,8 +1151,9 @@ static void em_combineMaps(EmissionMap *output, EmissionMap *em2, int hires_mult
 
                                        /* initialize with first input if in range */
                                        if (x >= em1.hmin[0] && x < em1.hmax[0] &&
-                                               y >= em1.hmin[1] && y < em1.hmax[1] &&
-                                               z >= em1.hmin[2] && z < em1.hmax[2]) {
+                                           y >= em1.hmin[1] && y < em1.hmax[1] &&
+                                           z >= em1.hmin[2] && z < em1.hmax[2])
+                                       {
                                                int index_in = smoke_get_index(x - em1.hmin[0], em1.hres[0], y - em1.hmin[1], em1.hres[1], z - em1.hmin[2]);
                                                /* values */
                                                output->influence_high[index_out] = em1.influence_high[index_in];
@@ -1158,8 +1161,9 @@ static void em_combineMaps(EmissionMap *output, EmissionMap *em2, int hires_mult
 
                                        /* apply second input if in range */
                                        if (x >= em2->hmin[0] && x < em2->hmax[0] &&
-                                               y >= em2->hmin[1] && y < em2->hmax[1] &&
-                                               z >= em2->hmin[2] && z < em2->hmax[2]) {
+                                           y >= em2->hmin[1] && y < em2->hmax[1] &&
+                                           z >= em2->hmin[2] && z < em2->hmax[2])
+                                       {
                                                int index_in = smoke_get_index(x - em2->hmin[0], em2->hres[0], y - em2->hmin[1], em2->hres[1], z - em2->hmin[2]);
 
                                                /* values */
index d798848e583d3ad7a7afc2e15c9e864063767c47..1b6fed70de3e13114cf26e77d4b6ed25c03b30c9 100644 (file)
@@ -676,11 +676,13 @@ static void add_2nd_order_roller(Object *ob, float UNUSED(stiffness), int *count
                                notthis = bs->v2;
                        }
                        else {
-                       if (v0 == bs->v2) {
-                               bpo = sb->bpoint+bs->v1;
-                               notthis = bs->v1;
-                       }
-                       else {printf("oops we should not get here -  add_2nd_order_springs");}
+                               if (v0 == bs->v2) {
+                                       bpo = sb->bpoint+bs->v1;
+                                       notthis = bs->v1;
+                               }
+                               else {
+                                       printf("oops we should not get here -  add_2nd_order_springs");
+                               }
                        }
                        if (bpo) {/* so now we have a 2nd order humpdidump */
                                for (c=bpo->nofsprings;c>0;c--) {
@@ -1977,12 +1979,12 @@ static int _softbody_calc_forces_slice_in_a_thread(Scene *scene, Object *ob, flo
 
        /* intitialize */
        if (sb) {
-       /* check conditions for various options */
-       /* +++ could be done on object level to squeeze out the last bits of it */
-       do_selfcollision=((ob->softflag & OB_SB_EDGES) && (sb->bspring)&& (ob->softflag & OB_SB_SELF));
-       do_springcollision=do_deflector && (ob->softflag & OB_SB_EDGES) &&(ob->softflag & OB_SB_EDGECOLL);
-       do_aero=((sb->aeroedge)&& (ob->softflag & OB_SB_EDGES));
-       /* --- could be done on object level to squeeze out the last bits of it */
+               /* check conditions for various options */
+               /* +++ could be done on object level to squeeze out the last bits of it */
+               do_selfcollision=((ob->softflag & OB_SB_EDGES) && (sb->bspring)&& (ob->softflag & OB_SB_SELF));
+               do_springcollision=do_deflector && (ob->softflag & OB_SB_EDGES) &&(ob->softflag & OB_SB_EDGECOLL);
+               do_aero=((sb->aeroedge)&& (ob->softflag & OB_SB_EDGES));
+               /* --- could be done on object level to squeeze out the last bits of it */
        }
        else {
                printf("Error expected a SB here\n");
@@ -2777,7 +2779,7 @@ static void apply_spring_memory(Object *ob)
                        l = len_v3v3(bp1->pos, bp2->pos);
                        r = bs->len/l;
                        if (( r > 1.05f) || (r < 0.95f)) {
-                       bs->len = ((100.0f - b) * bs->len  + b*l)/100.0f;
+                               bs->len = ((100.0f - b) * bs->len  + b*l)/100.0f;
                        }
                }
        }
@@ -2825,10 +2827,10 @@ static void springs_from_mesh(Object *ob)
 
        sb= ob->soft;
        if (me && sb) {
-       /* using bp->origS as a container for spring calcualtions here
-        * will be overwritten sbObjectStep() to receive
-        * actual modifier stack positions
-        */
+               /* using bp->origS as a container for spring calcualtions here
+                * will be overwritten sbObjectStep() to receive
+                * actual modifier stack positions
+                */
                if (me->totvert) {
                        bp= ob->soft->bpoint;
                        for (a=0; a<me->totvert; a++, bp++) {
@@ -3491,16 +3493,16 @@ static void softbody_reset(Object *ob, SoftBody *sb, float (*vertexCos)[3], int
                SB_estimate_transform(ob, NULL, NULL, NULL);
        }
        switch (ob->type) {
-       case OB_MESH:
-               if (ob->softflag & OB_SB_FACECOLL) mesh_faces_to_scratch(ob);
-               break;
-       case OB_LATTICE:
-               break;
-       case OB_CURVE:
-       case OB_SURF:
-               break;
-       default:
-               break;
+               case OB_MESH:
+                       if (ob->softflag & OB_SB_FACECOLL) mesh_faces_to_scratch(ob);
+                       break;
+               case OB_LATTICE:
+                       break;
+               case OB_CURVE:
+               case OB_SURF:
+                       break;
+               default:
+                       break;
        }
 }
 
index dad61868961a0c1e2e134051c0238aa20de63743..79dfd572dbba71ee13070f2dddd7c831acf29f2e 100644 (file)
@@ -944,7 +944,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *main)
                        }
                }
                {
-               /* Warn the user if he is using ["Text"] properties for Font objects */
+                       /* Warn the user if he is using ["Text"] properties for Font objects */
                        Object *ob;
                        bProperty *prop;
 
index 4847ae4be4209fb45fcf07c161a14715e598c854..a339a4d5734f4dbb40e64454ba7dd8808b5de6a9 100644 (file)
@@ -839,7 +839,7 @@ static BMOpDefine bmo_bmesh_to_mesh_def = {
        "bmesh_to_mesh",
        /* slots_in */
        {
-       /* pointer to a mesh structure to fill in */
+        /* pointer to a mesh structure to fill in */
         {"mesh", BMO_OP_SLOT_PTR, {(int)BMO_OP_SLOT_SUBTYPE_PTR_MESH}},
        /* pointer to an object structure */
         {"object", BMO_OP_SLOT_PTR, {(int)BMO_OP_SLOT_SUBTYPE_PTR_OBJECT}},
@@ -860,7 +860,7 @@ static BMOpDefine bmo_mesh_to_bmesh_def = {
        "mesh_to_bmesh",
        /* slots_in */
        {
-       /* pointer to a Mesh structure */
+        /* pointer to a Mesh structure */
         {"mesh", BMO_OP_SLOT_PTR, {(int)BMO_OP_SLOT_SUBTYPE_PTR_MESH}},
        /* pointer to an Object structure */
         {"object", BMO_OP_SLOT_PTR, {(int)BMO_OP_SLOT_SUBTYPE_PTR_OBJECT}},
index 269f933f27f4c87162da9ee30f4f6479953e2f79..d54efc271244bb6b54991a0f43a76c27ea917900 100644 (file)
@@ -242,6 +242,7 @@ void bmo_offset_edgeloops_exec(BMesh *bm, BMOperator *op)
 #if 0
                                                else if (BM_elem_index_get(l->prev->v) == -1) {
                                                        if (BM_elem_index_get(l->next->next->v) == -1) {
+                                                               /* pass */
                                                        }
                                                }
 #endif
index 334dff20d52b6197a3e9943a839dcf3087697836..0631ab42319ac82e7db41f6c4b6db14f6bea0f41 100644 (file)
@@ -566,14 +566,16 @@ void AnimationImporter:: Assign_transform_animations(COLLADAFW::Transformation *
                }
 
                case COLLADAFW::Transformation::MATRIX:
-                       /*{
-                          COLLADAFW::Matrix *mat = (COLLADAFW::Matrix*)transform;
-                          COLLADABU::Math::Matrix4 mat4 = mat->getMatrix();
-                          switch (binding->animationClass) {
-                          case COLLADAFW::AnimationList::TRANSFORM:
-
-                          }
-                          }*/
+#if 0
+                       {
+                               COLLADAFW::Matrix *mat = (COLLADAFW::Matrix*)transform;
+                               COLLADABU::Math::Matrix4 mat4 = mat->getMatrix();
+                               switch (binding->animationClass) {
+                                       case COLLADAFW::AnimationList::TRANSFORM:
+
+                               }
+                       }
+#endif
                        unused_fcurve(curves);
                        break;
                case COLLADAFW::Transformation::SKEW:
index 2bf0859b0f0ce6d814002cf66f2b1908f730169a..de92a7f2cc257155f3d1653a6eeafae8f001448b 100644 (file)
@@ -91,8 +91,9 @@ void EffectsExporter::exportEffects(Scene *sce)
                        openLibrary();
                        std::set<Image *>::iterator uv_images_iter;
                        for (uv_images_iter = uv_images.begin();
-                               uv_images_iter != uv_images.end();
-                               uv_images_iter++) {
+                            uv_images_iter != uv_images.end();
+                            uv_images_iter++)
+                       {
 
                                Image *ima = *uv_images_iter;
                                std::string key(id_name(ima));
index bc0275001d36eccd5d8b5bdecc1596d8d4b9dd2c..8406426a366fd4dea63c2046d569686491cfe7d5 100644 (file)
@@ -490,8 +490,9 @@ void GeometryExporter::createPolylists(std::set<Image *> uv_images,
 {
        std::set<Image *>::iterator uv_images_iter;
        for (uv_images_iter = uv_images.begin();
-               uv_images_iter != uv_images.end();
-               uv_images_iter++) {
+            uv_images_iter != uv_images.end();
+            uv_images_iter++)
+       {
 
                Image *ima = *uv_images_iter;
                std::string imageid(id_name(ima));
index de1a407546276fdb4ba868d8b5a54d349957447b..4d846693e50f4089b62d02a62aa02e9b3c8eef72 100644 (file)
@@ -51,8 +51,9 @@ void InstanceWriter::add_material_bindings(COLLADASW::BindMaterial& bind_materia
                std::set<Image *> uv_images = bc_getUVImages(ob, all_uv_layers);
                std::set<Image *>::iterator uv_images_iter;
                for (uv_images_iter = uv_images.begin();
-                       uv_images_iter != uv_images.end();
-                       uv_images_iter++) {
+                    uv_images_iter != uv_images.end();
+                    uv_images_iter++)
+               {
                        Image *ima = *uv_images_iter;
                        std::string matid(id_name(ima));
                        matid = get_material_id_from_id(matid);
index 6e6cc24be203329648f7641ba55be0096406839c..0c0395f2a21a0255e880e8d3871f7abae0e44d11 100644 (file)
@@ -56,8 +56,9 @@ void MaterialsExporter::exportMaterials(Scene *sce)
                        openLibrary();
                        std::set<Image *>::iterator uv_images_iter;
                        for (uv_images_iter = uv_images.begin();
-                               uv_images_iter != uv_images.end();
-                               uv_images_iter++) {
+                            uv_images_iter != uv_images.end();
+                            uv_images_iter++)
+                       {
 
                                Image *ima = *uv_images_iter;
                                std::string matid(id_name(ima));
index 2e265125a43a8a99f0ed580bdee9bf329a9501bc..f0dadf8cbc718e001d954881cb3c15d2c55ce561 100644 (file)
@@ -703,8 +703,9 @@ void MeshImporter::read_polys(COLLADAFW::Mesh *collada_mesh, Mesh *me)
                }
 
                if (collada_meshtype == COLLADAFW::MeshPrimitive::POLYLIST ||
-                       collada_meshtype == COLLADAFW::MeshPrimitive::POLYGONS ||
-                       collada_meshtype == COLLADAFW::MeshPrimitive::TRIANGLES) {
+                   collada_meshtype == COLLADAFW::MeshPrimitive::POLYGONS ||
+                   collada_meshtype == COLLADAFW::MeshPrimitive::TRIANGLES)
+               {
                        COLLADAFW::Polygons *mpvc = (COLLADAFW::Polygons *)mp;
                        unsigned int start_index = 0;
 
index fcd92e220c0ab3bcd80270c248b91251e483d2b1..8c4ddd67d07e447018ec0535b37f406ce6103318 100644 (file)
@@ -755,17 +755,17 @@ float bc_get_property(Bone *bone, std::string key, float def)
        IDProperty *property = bc_get_IDProperty(bone, key);
        if (property) {
                switch (property->type) {
-               case IDP_INT:
-                       result = (float)(IDP_Int(property));
-                       break;
-               case IDP_FLOAT:
-                       result = (float)(IDP_Float(property));
-                       break;
-               case IDP_DOUBLE:
-                       result = (float)(IDP_Double(property));
-                       break;
-               default:
-                       result = def;
+                       case IDP_INT:
+                               result = (float)(IDP_Int(property));
+                               break;
+                       case IDP_FLOAT:
+                               result = (float)(IDP_Float(property));
+                               break;
+                       case IDP_DOUBLE:
+                               result = (float)(IDP_Double(property));
+                               break;
+                       default:
+                               result = def;
                }
        }
        return result;
@@ -1066,4 +1066,4 @@ std::set<Image *> bc_getUVImages(Object *ob, bool all_uv_layers)
                }
        }
        return UVImages;
-}
\ No newline at end of file
+}
index fe13f3d60a2feebc40c0ee4d768e317c7b8d7b92..241ae20ce33e83b3f73c9c7490e0a23744f903fb 100644 (file)
@@ -152,31 +152,31 @@ void CompositorOperation::executeRegion(rcti *rect, unsigned int /*tileNumber*/)
        const RenderData *rd = this->m_rd;
 
        if (rd->mode & R_BORDER && rd->mode & R_CROP) {
-       /*!
-          When using cropped render result, need to re-position area of interest,
-          so it'll natch bounds of render border within frame. By default, canvas
-          will be centered between full frame and cropped frame, so we use such
-          scheme to map cropped coordinates to full-frame coordinates
-
-                  ^ Y
-                  |                      Width
-                  +------------------------------------------------+
-                  |                                                |
-                  |                                                |
-                  |  Centered canvas, we map coordinate from it    |
-                  |              +------------------+              |
-                  |              |                  |              |  H
-                  |              |                  |              |  e
-                  |  +------------------+ . Center  |              |  i
-                  |  |           |      |           |              |  g
-                  |  |           |      |           |              |  h
-                  |  |....dx.... +------|-----------+              |  t
-                  |  |           . dy   |                          |
-                  |  +------------------+                          |
-                  |  Render border, we map coordinates to it       |
-                  |                                                |    X
-                  +------------------------------------------------+---->
-                                       Full frame
+               /**
+                * When using cropped render result, need to re-position area of interest,
+                * so it'll natch bounds of render border within frame. By default, canvas
+                * will be centered between full frame and cropped frame, so we use such
+                * scheme to map cropped coordinates to full-frame coordinates
+                *
+                * ^ Y
+                * |                      Width
+                * +------------------------------------------------+
+                * |                                                |
+                * |                                                |
+                * |  Centered canvas, we map coordinate from it    |
+                * |              +------------------+              |
+                * |              |                  |              |  H
+                * |              |                  |              |  e
+                * |  +------------------+ . Center  |              |  i
+                * |  |           |      |           |              |  g
+                * |  |           |      |           |              |  h
+                * |  |....dx.... +------|-----------+              |  t
+                * |  |           . dy   |                          |
+                * |  +------------------+                          |
+                * |  Render border, we map coordinates to it       |
+                * |                                                |    X
+                * +------------------------------------------------+---->
+                *                      Full frame
                 */
 
                int full_width  = rd->xsch * rd->size / 100;
index bf6126658af190e0532bd85aa63a50ecc1571c74..6b2893780d7218e6823b0a12b447a1719d863069 100644 (file)
@@ -911,6 +911,7 @@ static void RIG_reconnectControlBones(RigGraph *rg)
                        
                        /* if we haven't found one yet, look in control bones */
                        if (ctrl->tail_mode == TL_NONE) {
+                               /* pass */
                        }
                }
        }
index ac4892de042773b1613882d1b39091a730858251..33d0b2ae6088f7055724bdf2472c30344a2c43f1 100644 (file)
@@ -2775,11 +2775,9 @@ void init_userdef_do_versions(void)
 
        /**
         * Include next version bump.
-        *
-        * (keep this block even if it becomes empty).
         */
        {
-               
+               /* (keep this block even if it becomes empty). */
        }
 
        if (U.pixelsize == 0.0f)
index 874225e96a7b309d3e67263c4da03b88a42112c4..053e932fe759344305e6cc32acd2c3273a180cef 100644 (file)
@@ -1945,7 +1945,7 @@ static KnifeEdge *knife_find_closest_edge(KnifeTool_OpData *kcd, float p[3], flo
 
                        /* check if we're close enough and calculate 'lambda' */
                        if (kcd->is_angle_snapping) {
-                       /* if snapping, check we're in bounds */
+                               /* if snapping, check we're in bounds */
                                float sco_snap[2];
                                isect_line_line_v2_point(kfe->v1->sco, kfe->v2->sco, kcd->prev.mval, kcd->curr.mval, sco_snap);
                                lambda = line_point_factor_v2(sco_snap, kfe->v1->sco, kfe->v2->sco);
index bdffaf313847232b8f510dd4f3c38288bb4cf478..50e3e20223d744a6c0e2ef8c0f19d425f18b856a 100644 (file)
@@ -1347,28 +1347,28 @@ static void toggle_key_select(PEData *data, int point_index, int key_index)
 static void select_action_apply(PTCacheEditPoint *point, PTCacheEditKey *key, int action)
 {
        switch (action) {
-       case SEL_SELECT:
-               if ((key->flag & PEK_SELECT) == 0) {
-                       key->flag |= PEK_SELECT;
-                       point->flag |= PEP_EDIT_RECALC;
-               }
-               break;
-       case SEL_DESELECT:
-               if (key->flag & PEK_SELECT) {
-                       key->flag &= ~PEK_SELECT;
-                       point->flag |= PEP_EDIT_RECALC;
-               }
-               break;
-       case SEL_INVERT:
-               if ((key->flag & PEK_SELECT) == 0) {
-                       key->flag |= PEK_SELECT;
-                       point->flag |= PEP_EDIT_RECALC;
-               }
-               else {
-                       key->flag &= ~PEK_SELECT;
-                       point->flag |= PEP_EDIT_RECALC;
-               }
-               break;
+               case SEL_SELECT:
+                       if ((key->flag & PEK_SELECT) == 0) {
+                               key->flag |= PEK_SELECT;
+                               point->flag |= PEP_EDIT_RECALC;
+                       }
+                       break;
+               case SEL_DESELECT:
+                       if (key->flag & PEK_SELECT) {
+                               key->flag &= ~PEK_SELECT;
+                               point->flag |= PEP_EDIT_RECALC;
+                       }
+                       break;
+               case SEL_INVERT:
+                       if ((key->flag & PEK_SELECT) == 0) {
+                               key->flag |= PEK_SELECT;
+                               point->flag |= PEP_EDIT_RECALC;
+                       }
+                       else {
+                               key->flag &= ~PEK_SELECT;
+                               point->flag |= PEP_EDIT_RECALC;
+                       }
+                       break;
        }
 }
 
index 62113cafebb53039777c94e71129995638357fa4..cbdf05a1c82a25638ab7feaddf65a6d389b1dfc9 100644 (file)
@@ -1741,6 +1741,7 @@ static void area_split_cancel(bContext *C, wmOperator *op)
        sAreaSplitData *sd = (sAreaSplitData *)op->customdata;
        
        if (sd->previewmode) {
+               /* pass */
        }
        else {
                if (screen_area_join(C, CTX_wm_screen(C), sd->sarea, sd->narea)) {
index 3657e4d2a1f70d237c232ba8d110353fcf7242a4..1623712786c453892fd0438b74af66dab591484d 100644 (file)
@@ -606,7 +606,7 @@ static void file_tools_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa),
 #if 0
        /* context changes */
        switch (wmn->category) {
-               
+               /* pass */
        }
 #endif
 }
index 3080ac2de84430d909c8f1e7d219bd6bbfd94cb4..9551a1cf362d9ee2ea4cea8f0b36cefd3f934383 100644 (file)
@@ -72,7 +72,7 @@ static void do_nla_region_buttons(bContext *C, void *UNUSED(arg), int UNUSED(eve
        //Scene *scene = CTX_data_scene(C);
 #if 0
        switch (event) {
-
+               /* pass */
        }
 #endif
        /* default for now */
index 14661e2f44fe283f8e7359546438810c75f0bbd2..c3a27dad53856974f4a7b4bb7fbba5328ebf6780 100644 (file)
@@ -1429,7 +1429,7 @@ void draw_image_seq(const bContext *C, Scene *scene, ARegion *ar, SpaceSeq *sseq
        /* NOTE: sequencer mask editing isnt finished, the draw code is working but editing not,
         * for now just disable drawing since the strip frame will likely be offset */
 
-       //if (sc->mode == SC_MODE_MASKEDIT) {
+       // if (sc->mode == SC_MODE_MASKEDIT)
        if (0 && sseq->mainb == SEQ_DRAW_IMG_IMBUF) {
                Mask *mask = BKE_sequencer_mask_get(scene);
 
index 90014667b438ed76d8a72de7523f566530a0fafa..4a8bd5287df9a6e5021d171fafd60e265eb8b1d2 100644 (file)
@@ -5552,7 +5552,7 @@ static void slide_origdata_interp_data_vert(
                project_plane_normalized_v3_v3v3(v_proj[1], sv->co_orig_3d, v_proj_axis);
        }
 
-       // BM_ITER_ELEM (l, &liter, sv->v, BM_LOOPS_OF_VERT) {
+       // BM_ITER_ELEM (l, &liter, sv->v, BM_LOOPS_OF_VERT)
        BM_iter_init(&liter, bm, BM_LOOPS_OF_VERT, sv->v);
        l_num = liter.count;
        loop_weights = do_loop_weight ? BLI_array_alloca(loop_weights, l_num) : NULL;
index a4281514e39077d2eb1a546be66baa6a24692a04..7c11fca3c34201f1c310ac8f7d59ca364825d754 100644 (file)
@@ -704,11 +704,12 @@ void DDSHeader::setPixelFormat(uint bitcount, uint rmask, uint gmask, uint bmask
 {
        // Make sure the masks are correct.
        if ((rmask & gmask) ||
-               (rmask & bmask) ||
-               (rmask & amask) ||
-               (gmask & bmask) ||
-               (gmask & amask) ||
-               (bmask & amask)) {
+           (rmask & bmask) ||
+           (rmask & amask) ||
+           (gmask & bmask) ||
+           (gmask & amask) ||
+           (bmask & amask))
+       {
                printf("DDS: bad RGBA masks, pixel format not set\n");
                return;
        }
@@ -1068,7 +1069,7 @@ bool DirectDrawSurface::isTexture3D() const
        }
        else
        {
-       return (header.caps.caps2 & DDSCAPS2_VOLUME) != 0;
+               return (header.caps.caps2 & DDSCAPS2_VOLUME) != 0;
        }
 }
 
index 1965361b81b7a91aa48700e888c901d3a4d6259c..1959a017e436251cc67340518d11b1513610ad60 100644 (file)
@@ -358,7 +358,7 @@ static const EnumPropertyItem *rna_Material_texture_coordinates_itemf(bContext *
        RNA_enum_items_add_value(&item, &totitem, prop_texture_coordinates_items, TEXCO_ORCO);
        
        if (ma->material_type == MA_TYPE_VOLUME) {
-               
+               /* pass */
        }
        else if (ELEM(ma->material_type, MA_TYPE_SURFACE, MA_TYPE_HALO, MA_TYPE_WIRE)) {
                RNA_enum_items_add_value(&item, &totitem, prop_texture_coordinates_items, TEXCO_UV);
index b10389538c2ed138bed5ca404c91309fd1dca6e2..83827067775ef6f2c976cdf5af5acf14ad514a1a 100644 (file)
@@ -979,18 +979,18 @@ static void add_to_diffuse(float diff[3], const ShadeInput *shi, const float is,
 
                        /* input */
                        switch (ma->rampin_col) {
-                       case MA_RAMP_IN_ENERGY:
-                               fac = IMB_colormanagement_get_luminance(rgb);
-                               break;
-                       case MA_RAMP_IN_SHADER:
-                               fac = is;
-                               break;
-                       case MA_RAMP_IN_NOR:
-                               fac = dot_v3v3(shi->view, shi->vn);
-                               break;
-                       default:
-                               fac = 0.0f;
-                               break;
+                               case MA_RAMP_IN_ENERGY:
+                                       fac = IMB_colormanagement_get_luminance(rgb);
+                                       break;
+                               case MA_RAMP_IN_SHADER:
+                                       fac = is;
+                                       break;
+                               case MA_RAMP_IN_NOR:
+                                       fac = dot_v3v3(shi->view, shi->vn);
+                                       break;
+                               default:
+                                       fac = 0.0f;
+                                       break;
                        }
        
                        BKE_colorband_evaluate(ma->ramp_col, fac, col);