Code Cleanup: style
authorCampbell Barton <ideasman42@gmail.com>
Fri, 20 Dec 2013 10:43:42 +0000 (21:43 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 20 Dec 2013 10:52:08 +0000 (21:52 +1100)
source/blender/blenkernel/intern/object.c
source/blender/editors/sculpt_paint/paint_mask.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/space_view3d/drawvolume.c

index a3b0dfc1dfda41f93f936bae51a9b8579711d222..8657e3b0ebfac0313e29aa4c1634a9bcf20dec92 100644 (file)
@@ -1097,7 +1097,7 @@ static LodLevel *lod_level_select(Object *ob, const float cam_loc[3])
        sub_v3_v3v3(delta, ob_loc, cam_loc);
        distance2 = len_squared_v3(delta);
 
-       if (distance2 < current->distance*current->distance) {
+       if (distance2 < current->distance * current->distance) {
                /* check for higher LoD */
                while (current->prev && distance2 < (current->distance * current->distance)) {
                        current = current->prev;
index acc138afcb86f484e75d096cc96ba2262f1f6d50..a116cb59de8e38d5ac4a7344ffd983d4b88976f4 100644 (file)
@@ -222,9 +222,9 @@ int do_sculpt_mask_box_select(ViewContext *vc, rcti *rect, bool select, bool UNU
 
        for (symmpass = 0; symmpass <= symm; ++symmpass) {
                if (symmpass == 0 ||
-                       (symm & symmpass &&
-                        (symm != 5 || symmpass != 3) &&
-                        (symm != 6 || (symmpass != 3 && symmpass != 5))))
+                   (symm & symmpass &&
+                    (symm != 5 || symmpass != 3) &&
+                    (symm != 6 || (symmpass != 3 && symmpass != 5))))
                {
                        int j = 0;
 
@@ -365,10 +365,10 @@ static int paint_mask_gesture_lasso_exec(bContext *C, wmOperator *op)
                sculpt_undo_push_begin("Mask lasso fill");
 
                for (symmpass = 0; symmpass <= symm; ++symmpass) {
-                       if (symmpass == 0 ||
-                                       (symm & symmpass &&
-                                        (symm != 5 || symmpass != 3) &&
-                                        (symm != 6 || (symmpass != 3 && symmpass != 5))))
+                       if ((symmpass == 0) ||
+                           (symm & symmpass &&
+                            (symm != 5 || symmpass != 3) &&
+                            (symm != 6 || (symmpass != 3 && symmpass != 5))))
                        {
                                int j = 0;
 
index 975aa28166e97fdc52f73da11b684fd7765dca55..884a09a56e3efecb7f2735828ea93061d79c9706 100644 (file)
@@ -3293,7 +3293,8 @@ static void sculpt_combine_proxies(Sculpt *sd, Object *ob)
 
        /* first line is tools that don't support proxies */
        if (!ELEM(brush->sculpt_tool, SCULPT_TOOL_SMOOTH, SCULPT_TOOL_LAYER) ||
-           ss->cache->supports_gravity) {
+           ss->cache->supports_gravity)
+       {
                /* these brushes start from original coordinates */
                const bool use_orco = ELEM3(brush->sculpt_tool, SCULPT_TOOL_GRAB,
                                            SCULPT_TOOL_ROTATE, SCULPT_TOOL_THUMB);
index 6ce38e661a2352322165c1918dbcb83239ccb1b8..eb4493a9d1abfaee1509eb1a3ec5288862c298e0 100644 (file)
@@ -473,11 +473,11 @@ void draw_smoke_volume(SmokeDomainSettings *sds, Object *ob,
                                glColor3f(1.0, 1.0, 1.0);
                                for (i = 0; i < numpoints; i++) {
                                        glTexCoord3d((points[i][0] - min[0]) * cor[0],
-                                                                (points[i][1] - min[1]) * cor[1],
-                                                                (points[i][2] - min[2]) * cor[2]);
+                                                    (points[i][1] - min[1]) * cor[1],
+                                                    (points[i][2] - min[2]) * cor[2]);
                                        glVertex3f(points[i][0] * ob_sizei[0],
-                                                          points[i][1] * ob_sizei[1],
-                                                          points[i][2] * ob_sizei[2]);
+                                                  points[i][1] * ob_sizei[1],
+                                                  points[i][2] * ob_sizei[2]);
                                }
                                glEnd();
                        }