[Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58385] trunk/blender/source/blender/ blenkernel/intern/object.c: code cleanup: inconsistent 'break' placement in BKE_object_minmax

[Sergey Sharybin]

Hi,

Could we not do style cleanup during GSoC?  Like do not do cleanup at all.
This leads to bunch of headache with svn merge.


On Fri, Jul 19, 2013 at 4:40 PM, Campbell Barton <ideasman42 at gmail.com>wrote:

> Revision: 58385
>
> http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58385
> Author:   campbellbarton
> Date:     2013-07-19 10:40:12 +0000 (Fri, 19 Jul 2013)
> Log Message:
> -----------
> code cleanup: inconsistent 'break' placement in BKE_object_minmax
>
> Modified Paths:
> --------------
>     trunk/blender/source/blender/blenkernel/intern/object.c
>
> Modified: trunk/blender/source/blender/blenkernel/intern/object.c
> ===================================================================
> --- trunk/blender/source/blender/blenkernel/intern/object.c     2013-07-19
> 10:40:06 UTC (rev 58384)
> +++ trunk/blender/source/blender/blenkernel/intern/object.c     2013-07-19
> 10:40:12 UTC (rev 58385)
> @@ -2357,8 +2357,9 @@
>
>                         /* Use the object bounding box so that modifier
> output
>                          * gets taken into account */
> -                       if (ob->bb)
> +                       if (ob->bb) {
>                                 bb = *(ob->bb);
> +                       }
>                         else {
>                                 if (cu->bb == NULL)
>                                         BKE_curve_texspace_calc(cu);
> @@ -2370,8 +2371,8 @@
>                                 minmax_v3v3_v3(min_r, max_r, bb.vec[a]);
>                         }
>                         change = TRUE;
> +                       break;
>                 }
> -               break;
>                 case OB_LATTICE:
>                 {
>                         Lattice *lt = ob->data;
> @@ -2387,9 +2388,10 @@
>                                 }
>                         }
>                         change = TRUE;
> +                       break;
>                 }
> -               break;
>                 case OB_ARMATURE:
> +               {
>                         if (ob->pose) {
>                                 bArmature *arm = ob->data;
>                                 bPoseChannel *pchan;
> @@ -2408,6 +2410,7 @@
>                                 }
>                         }
>                         break;
> +               }
>                 case OB_MESH:
>                 {
>                         Mesh *me = BKE_mesh_from_object(ob);
> @@ -2421,8 +2424,8 @@
>                                 }
>                                 change = TRUE;
>                         }
> +                       break;
>                 }
> -               break;
>                 case OB_MBALL:
>                 {
>                         float ob_min[3], ob_max[3];
>
> _______________________________________________
> Bf-blender-cvs mailing list
> Bf-blender-cvs at blender.org
> http://lists.blender.org/mailman/listinfo/bf-blender-cvs
>



-- 
With best regards, Sergey Sharybin