Cleanup: indentation
authorCampbell Barton <ideasman42@gmail.com>
Wed, 11 Mar 2015 02:14:24 +0000 (13:14 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 11 Mar 2015 02:14:24 +0000 (13:14 +1100)
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/cloth.c
source/blender/blenkernel/intern/effect.c
source/blender/blenkernel/intern/softbody.c
source/blender/blenloader/intern/readfile.c
source/blender/bmesh/operators/bmo_normals.c
source/blender/editors/object/object_edit.c
source/blender/editors/space_clip/tracking_select.c
source/blender/editors/space_view3d/space_view3d.c
source/blender/windowmanager/intern/wm_operators.c
source/blender/windowmanager/intern/wm_window.c

index 51f17f738f09ddefbc94ccd1f6653d8093c41a52..870b020c8deb4b091308c23f455d9f6a0cbb8a05 100644 (file)
@@ -3206,7 +3206,8 @@ static void navmesh_drawColored(DerivedMesh *dm)
 #endif
 
        glDisable(GL_LIGHTING);
-       /* if (GPU_buffer_legacy(dm) ) */ { /* TODO - VBO draw code, not high priority - campbell */
+       /* if (GPU_buffer_legacy(dm) ) */ /* TODO - VBO draw code, not high priority - campbell */
+       {
                DEBUG_VBO("Using legacy code. drawNavMeshColored\n");
                //glShadeModel(GL_SMOOTH);
                glBegin(glmode = GL_QUADS);
index 317348903fffbd96a2c6c861cfbe28fce048365c..3b3fe323f2b39298df0c128a6ad770533e6a9b22 100644 (file)
@@ -780,17 +780,15 @@ static void cloth_apply_vgroup ( ClothModifierData *clmd, DerivedMesh *dm )
                                                        }
                                                }
 
-                                       if (clmd->sim_parms->vgroup_shrink > 0 )
-                                       {
-                                               if ( dvert->dw[j].def_nr == (clmd->sim_parms->vgroup_shrink-1))
-                                               {
-                                                       verts->shrink_factor = clmd->sim_parms->shrink_min*(1.0f-dvert->dw[j].weight)+clmd->sim_parms->shrink_max*dvert->dw [j].weight; // linear interpolation between min and max shrink factor based on weight
+                                               if (clmd->sim_parms->vgroup_shrink > 0) {
+                                                       if (dvert->dw[j].def_nr == (clmd->sim_parms->vgroup_shrink - 1)) {
+                                                               /* linear interpolation between min and max shrink factor based on weight */
+                                                               verts->shrink_factor = clmd->sim_parms->shrink_min * (1.0f - dvert->dw[j].weight) + clmd->sim_parms->shrink_max * dvert->dw [j].weight;
+                                                       }
+                                               }
+                                               else {
+                                                       verts->shrink_factor = clmd->sim_parms->shrink_min;
                                                }
-                                       }
-                                       else {
-                                               verts->shrink_factor = clmd->sim_parms->shrink_min;
-                                       }
-
                                        }
                                }
                        }
index 76a39fed3f616c8a14eb9cc0024138108af0edc4..296a56ada5ddf281129d37e96761a994957ec7e8 100644 (file)
@@ -231,7 +231,7 @@ ListBase *pdInitEffectors(Scene *scene, Object *ob_src, ParticleSystem *psys_src
                for (base = scene->base.first; base; base= base->next) {
                        if ( (base->lay & layer) ) {
                                if ( base->object->pd && base->object->pd->forcefield )
-                               add_object_to_effectors(&effectors, scene, weights, base->object, ob_src);
+                                       add_object_to_effectors(&effectors, scene, weights, base->object, ob_src);
 
                                if ( base->object->particlesystem.first ) {
                                        ParticleSystem *psys= base->object->particlesystem.first;
index 06d0627fd2ca06ebdc0c2dd147ce6581afa422aa..3cc2337d4f1619590ee66e2ef851d528f8b0d7a5 100644 (file)
@@ -522,10 +522,8 @@ static void ccd_mesh_update(Object *ob, ccd_Mesh *pccd_M)
                        mima->maxz = max_ff(mima->maxz, v[2] + hull);
                }
 
-
-       mima++;
-       mface++;
-
+               mima++;
+               mface++;
        }
        return;
 }
@@ -707,7 +705,7 @@ static void add_2nd_order_roller(Object *ob, float UNUSED(stiffness), int *count
                                                }
                                        }
                                        if ((bs2->v2 !=notthis)&&(bs2->v2 > v0)) {
-                                       (*counter)++;/*hit */
+                                               (*counter)++;  /* hit */
                                                if (addsprings) {
                                                        bs3->v1= v0;
                                                        bs3->v2= bs2->v2;
index 45d1c2038c22266ec99730dcb04936360b2a911e..b46658f48b177e2a14052a6618028462c77dd63c 100644 (file)
@@ -3767,25 +3767,26 @@ static void lib_link_particlesettings(FileData *fd, Main *main)
                                BoidRule *rule;
                                for (; state; state=state->next) {
                                        rule = state->rules.first;
-                               for (; rule; rule=rule->next)
-                                       switch (rule->type) {
-                                               case eBoidRuleType_Goal:
-                                               case eBoidRuleType_Avoid:
-                                               {
-                                                       BoidRuleGoalAvoid *brga = (BoidRuleGoalAvoid*)rule;
-                                                       brga->ob = newlibadr(fd, part->id.lib, brga->ob);
-                                                       break;
-                                               }
-                                               case eBoidRuleType_FollowLeader:
-                                               {
-                                                       BoidRuleFollowLeader *brfl = (BoidRuleFollowLeader*)rule;
-                                                       brfl->ob = newlibadr(fd, part->id.lib, brfl->ob);
-                                                       break;
+                                       for (; rule; rule=rule->next) {
+                                               switch (rule->type) {
+                                                       case eBoidRuleType_Goal:
+                                                       case eBoidRuleType_Avoid:
+                                                       {
+                                                               BoidRuleGoalAvoid *brga = (BoidRuleGoalAvoid*)rule;
+                                                               brga->ob = newlibadr(fd, part->id.lib, brga->ob);
+                                                               break;
+                                                       }
+                                                       case eBoidRuleType_FollowLeader:
+                                                       {
+                                                               BoidRuleFollowLeader *brfl = (BoidRuleFollowLeader*)rule;
+                                                               brfl->ob = newlibadr(fd, part->id.lib, brfl->ob);
+                                                               break;
+                                                       }
                                                }
                                        }
                                }
                        }
-                       
+
                        for (a = 0; a < MAX_MTEX; a++) {
                                mtex= part->mtex[a];
                                if (mtex) {
index 0ef96553d671b67328ac761afeb579121566dc91..f62e445ca18b1ec26959e35b704f624196a4a528 100644 (file)
@@ -71,7 +71,7 @@ static bool bmo_recalc_normal_edge_filter_cb(BMElem *ele, void *UNUSED(user_data
  *
  * To take these spikes into account, use the normals of the faces edges.
  */
- #define USE_FACE_EDGE_NORMAL_TEST
+#define USE_FACE_EDGE_NORMAL_TEST
 
 /**
  * The center of the entire island is't necessarily well placed,
index 458feebaec7aaf83e2b11978ed82720ab4e871ba..e14b3036743a5da2d409184be5730a082b87a689 100644 (file)
@@ -2063,4 +2063,4 @@ bool ED_object_editmode_calc_active_center(Object *obedit, const bool select_onl
        }
 
        return false;
-}
\ No newline at end of file
+}
index bc6ac507f03c450e325ab8a840a240a3aec5a68f..0b29c253f3ab71486f1f4b205093bf3a8cbde0ba 100644 (file)
@@ -62,7 +62,6 @@ static float dist_to_crns(float co[2], float pos[2], float crns[4][2]);
 static int mouse_on_side(float co[2], float x1, float y1, float x2, float y2, float epsx, float epsy)
 {
        if (x1 > x2)
-
                SWAP(float, x1, x2);
 
        if (y1 > y2)
index 1112f2e738316253a703087952f265340cb45597..35fb2bce1152a17460dd8ff367cb48ca48dd35ba 100644 (file)
@@ -420,10 +420,10 @@ static void view3d_free(SpaceLink *sl)
                MEM_freeN(vd->defmaterial);
        }
 
-               if (vd->fx_settings.ssao)
-                       MEM_freeN(vd->fx_settings.ssao);
-               if (vd->fx_settings.dof)
-                       MEM_freeN(vd->fx_settings.dof);
+       if (vd->fx_settings.ssao)
+               MEM_freeN(vd->fx_settings.ssao);
+       if (vd->fx_settings.dof)
+               MEM_freeN(vd->fx_settings.dof);
 }
 
 
index 1dc719deb2b7c4a84ccba86cfe540bbe999ca442..5d0c5d4e60d1c16b2c3726c9ad1bd2163b0bc0e0 100644 (file)
@@ -4326,9 +4326,9 @@ static int radial_control_modal(bContext *C, wmOperator *op, const wmEvent *even
        float delta[2], ret = OPERATOR_RUNNING_MODAL;
        bool snap;
        float angle_precision = 0.0f;
-    const bool has_numInput = hasNumInput(&rc->num_input);
-    bool handled = false;
-    float numValue;
+       const bool has_numInput = hasNumInput(&rc->num_input);
+       bool handled = false;
+       float numValue;
        /* TODO: fix hardcoded events */
 
        snap = event->ctrl != 0;
index e341e4900fa8bdd9283b83267f160aea5e997c27..4f7e5ab75b352cfd051d5e7fdef2fc9bcf2237bc 100644 (file)
@@ -364,7 +364,8 @@ static void wm_window_add_ghostwindow(wmWindowManager *wm, const char *title, wm
         * mix it, either all windows have it, or none (tested in OSX opengl) */
        if (multisamples == -1)
                multisamples = U.ogl_multisamples;
-               glSettings.numOfAASamples = multisamples;
+
+       glSettings.numOfAASamples = multisamples;
 
        if (!(U.uiflag2 & USER_OPENGL_NO_WARN_SUPPORT))
                glSettings.flags |= GHOST_glWarnSupport;