Merging r39634 through r39716 from trunk into soc-2011-tomato
[blender-staging.git] / source / blender / editors / screen / screen_ops.c
index afdd2a3403085a9e55f3cc7ec77cbcd6a26b5be2..807152c13a3b835437251ddfc4927477a125f561 100644 (file)
@@ -1544,8 +1544,7 @@ static int area_max_regionsize(ScrArea *sa, ARegion *scalear, AZEdge edge)
        
        /* subtractwidth of regions on opposite side 
         * prevents dragging regions into other opposite regions */
-       for (ar=sa->regionbase.first; ar; ar=ar->next)
-       {
+       for (ar=sa->regionbase.first; ar; ar=ar->next) {
                if (ar == scalear)
                        continue;
                
@@ -2021,12 +2020,12 @@ static void SCREEN_OT_screen_full_area(wmOperatorType *ot)
  */
 
 typedef struct sAreaJoinData
-       {
-               ScrArea *sa1;   /* first area to be considered */
-               ScrArea *sa2;   /* second area to be considered */
-               ScrArea *scr;   /* designed for removal */
-               
-       } sAreaJoinData;
+{
+       ScrArea *sa1;   /* first area to be considered */
+       ScrArea *sa2;   /* second area to be considered */
+       ScrArea *scr;   /* designed for removal */
+
+} sAreaJoinData;
 
 
 /* validate selection inside screen, set variables OK */