Commit: eb6fe5fa94b86a0a20742e06bf1e68b4cbaf6693
Author: Campbell Barton
Date:   Mon Apr 16 18:13:48 2018 +0200
Branches: master
https://developer.blender.org/rBeb6fe5fa94b86a0a20742e06bf1e68b4cbaf6693

Cleanup: indentation

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

M       source/blender/alembic/intern/abc_hair.cc
M       source/blender/alembic/intern/abc_object.cc
M       source/blender/blenkernel/intern/cloth.c
M       source/blender/blenkernel/intern/particle_distribute.c
M       source/blender/blenkernel/intern/softbody.c
M       source/blender/collada/AnimationImporter.cpp
M       source/blender/collada/EffectExporter.cpp
M       source/blender/collada/MeshImporter.cpp
M       source/blender/editors/physics/particle_object.c

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

diff --git a/source/blender/alembic/intern/abc_hair.cc 
b/source/blender/alembic/intern/abc_hair.cc
index 8f8ed2019d5..0208da8a6d7 100644
--- a/source/blender/alembic/intern/abc_hair.cc
+++ b/source/blender/alembic/intern/abc_hair.cc
@@ -252,8 +252,9 @@ void AbcHairWriter::write_hair_child_sample(DerivedMesh *dm,
                path = cache[p];
 
                if (part->from == PART_FROM_FACE &&
-                       part->childtype != PART_CHILD_PARTICLES &&
-                       mtface) {
+                   part->childtype != PART_CHILD_PARTICLES &&
+                   mtface)
+               {
                        const int num = pc->num;
                        if (num < 0) {
                                ABC_LOG(m_settings.logger)
diff --git a/source/blender/alembic/intern/abc_object.cc 
b/source/blender/alembic/intern/abc_object.cc
index 6c4cb60d63c..ddedcf6dcbc 100644
--- a/source/blender/alembic/intern/abc_object.cc
+++ b/source/blender/alembic/intern/abc_object.cc
@@ -290,7 +290,8 @@ Alembic::AbcGeom::IXform AbcObjectReader::xform()
 
        /* The archive's top object can be recognised by not having a parent. */
        if (abc_parent.getParent()
-               && IXform::matches(abc_parent.getMetaData())) {
+               && IXform::matches(abc_parent.getMetaData()))
+       {
                return IXform(abc_parent, Alembic::AbcGeom::kWrapExisting);
        }
 
diff --git a/source/blender/blenkernel/intern/cloth.c 
b/source/blender/blenkernel/intern/cloth.c
index e1717f60a0f..9ae295e2e3b 100644
--- a/source/blender/blenkernel/intern/cloth.c
+++ b/source/blender/blenkernel/intern/cloth.c
@@ -456,7 +456,8 @@ void clothModifier_do(ClothModifierData *clmd, Scene 
*scene, Object *ob, Derived
        cache_result = BKE_ptcache_read(&pid, (float)framenr+scene->r.subframe, 
can_simulate);
 
        if (cache_result == PTCACHE_READ_EXACT || cache_result == 
PTCACHE_READ_INTERPOLATED ||
-           (!can_simulate && cache_result == PTCACHE_READ_OLD)) {
+           (!can_simulate && cache_result == PTCACHE_READ_OLD))
+       {
                BKE_cloth_solver_set_positions(clmd);
                cloth_to_object (ob, clmd, vertexCos);
 
diff --git a/source/blender/blenkernel/intern/particle_distribute.c 
b/source/blender/blenkernel/intern/particle_distribute.c
index bcb2b770db3..d1c6dbe421c 100644
--- a/source/blender/blenkernel/intern/particle_distribute.c
+++ b/source/blender/blenkernel/intern/particle_distribute.c
@@ -240,10 +240,12 @@ static void distribute_grid(DerivedMesh *dm, 
ParticleSystem *psys)
                                                if (mface->v4 && 
(!intersects_tri || from==PART_FROM_VOLUME)) {
                                                        copy_v3_v3(v4, 
mvert[mface->v4].co);
 
-                                                       if 
(isect_ray_tri_watertight_v3(co1,
-                                                                               
        &isect_precalc,
-                                                                               
        v1, v3, v4,
-                                                                               
        &lambda, NULL)) {
+                                                       if 
(isect_ray_tri_watertight_v3(
+                                                                   co1,
+                                                                   
&isect_precalc,
+                                                                   v1, v3, v4,
+                                                                   &lambda, 
NULL))
+                                                       {
                                                                if 
(from==PART_FROM_FACE)
                                                                        
(pa+(int)(lambda*size[a])*a0mul)->flag &= ~PARS_UNEXIST;
                                                                else
diff --git a/source/blender/blenkernel/intern/softbody.c 
b/source/blender/blenkernel/intern/softbody.c
index 1b6fed70de3..c3527af90ca 100644
--- a/source/blender/blenkernel/intern/softbody.c
+++ b/source/blender/blenkernel/intern/softbody.c
@@ -3722,7 +3722,8 @@ void sbObjectStep(Scene *scene, Object *ob, float cfra, 
float (*vertexCos)[3], i
        cache_result = BKE_ptcache_read(&pid, (float)framenr+scene->r.subframe, 
can_simulate);
 
        if (cache_result == PTCACHE_READ_EXACT || cache_result == 
PTCACHE_READ_INTERPOLATED ||
-           (!can_simulate && cache_result == PTCACHE_READ_OLD)) {
+           (!can_simulate && cache_result == PTCACHE_READ_OLD))
+       {
                softbody_to_object(ob, vertexCos, numVerts, sb->local);
 
                BKE_ptcache_validate(cache, framenr);
diff --git a/source/blender/collada/AnimationImporter.cpp 
b/source/blender/collada/AnimationImporter.cpp
index 0631ab42319..226f8309ffb 100644
--- a/source/blender/collada/AnimationImporter.cpp
+++ b/source/blender/collada/AnimationImporter.cpp
@@ -1753,7 +1753,8 @@ bool 
AnimationImporter::evaluate_animation(COLLADAFW::Transformation *tm, float
        if (type != COLLADAFW::Transformation::ROTATE &&
            type != COLLADAFW::Transformation::SCALE &&
            type != COLLADAFW::Transformation::TRANSLATE &&
-           type != COLLADAFW::Transformation::MATRIX) {
+           type != COLLADAFW::Transformation::MATRIX)
+       {
                fprintf(stderr, "animation of transformation %d is not 
supported yet\n", type);
                return false;
        }
diff --git a/source/blender/collada/EffectExporter.cpp 
b/source/blender/collada/EffectExporter.cpp
index de92a7f2cc2..a4764cab67e 100644
--- a/source/blender/collada/EffectExporter.cpp
+++ b/source/blender/collada/EffectExporter.cpp
@@ -149,12 +149,13 @@ void EffectsExporter::writePhong(COLLADASW::EffectProfile 
&ep, Material *ma)
        ep.setSpecular(cot, false, "specular");
 }
 
-void EffectsExporter::writeTextures(COLLADASW::EffectProfile &ep,
-                                                                       
std::string &key,
-                                                                       
COLLADASW::Sampler *sampler, 
-                                                                       MTex 
*t, Image *ima,
-                                                                       
std::string &uvname ) {
-               
+void EffectsExporter::writeTextures(
+        COLLADASW::EffectProfile &ep,
+        std::string &key,
+        COLLADASW::Sampler *sampler, 
+        MTex *t, Image *ima,
+        std::string &uvname )
+{
        // Image not set for texture
        if (!ima) return;
 
diff --git a/source/blender/collada/MeshImporter.cpp 
b/source/blender/collada/MeshImporter.cpp
index f0dadf8cbc7..9848bf3b50b 100644
--- a/source/blender/collada/MeshImporter.cpp
+++ b/source/blender/collada/MeshImporter.cpp
@@ -1093,7 +1093,8 @@ MTFace 
*MeshImporter::assign_material_to_geom(COLLADAFW::MaterialBinding cmateri
        // set texture face
        if (color_texture &&
            strlen((color_texture)->uvname) &&
-           !STREQ(layername, color_texture->uvname)) {
+           !STREQ(layername, color_texture->uvname))
+       {
                texture_face = (MTFace *)CustomData_get_layer_named(&me->fdata, 
CD_MTFACE,
                                                                    
color_texture->uvname);
                strcpy(layername, color_texture->uvname);
diff --git a/source/blender/editors/physics/particle_object.c 
b/source/blender/editors/physics/particle_object.c
index 53a70abca05..546fac6b7a3 100644
--- a/source/blender/editors/physics/particle_object.c
+++ b/source/blender/editors/physics/particle_object.c
@@ -705,8 +705,8 @@ static bool remap_hair_emitter(Scene *scene, Object *ob, 
ParticleSystem *psys,
 
        for (i = 0, tpa = target_psys->particles, pa = psys->particles;
             i < target_psys->totpart;
-            i++, tpa++, pa++) {
-
+            i++, tpa++, pa++)
+       {
                float from_co[3];
                BVHTreeNearest nearest;
 
@@ -1004,8 +1004,8 @@ static bool copy_particle_systems_to_object(Main *bmain,
        cdmask = 0;
        for (psys_from = PSYS_FROM_FIRST, i = 0;
             psys_from;
-            psys_from = PSYS_FROM_NEXT(psys_from), ++i) {
-               
+            psys_from = PSYS_FROM_NEXT(psys_from), ++i)
+       {
                psys = BKE_object_copy_particlesystem(psys_from, 0);
                tmp_psys[i] = psys;
                
@@ -1025,8 +1025,8 @@ static bool copy_particle_systems_to_object(Main *bmain,
        /* now append psys to the object and make modifiers */
        for (i = 0, psys_from = PSYS_FROM_FIRST;
             i < totpsys;
-            ++i, psys_from = PSYS_FROM_NEXT(psys_from)) {
-               
+            ++i, psys_from = PSYS_FROM_NEXT(psys_from))
+       {
                ParticleSystemModifierData *psmd;
                
                psys = tmp_psys[i];
@@ -1063,8 +1063,8 @@ static bool copy_particle_systems_to_object(Main *bmain,
         */
        for (psys = psys_start, psys_from = PSYS_FROM_FIRST, i = 0;
             psys;
-            psys = psys->next, psys_from = PSYS_FROM_NEXT(psys_from), ++i) {
-               
+            psys = psys->next, psys_from = PSYS_FROM_NEXT(psys_from), ++i)
+       {
                float (*from_mat)[4], (*to_mat)[4];
                
                switch (space) {

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

Reply via email to