Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2013-07-19 14:40:12 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-07-19 14:40:12 +0400
commit965d2fd4267a6c6554c8532de1b92832fa4b0226 (patch)
tree2fe5fb894b09122ac72d89c2a749890c84a5b3cc
parentefc7b7a2853cfbcfb20c80e0d16db11109fad22f (diff)
code cleanup: inconsistent 'break' placement in BKE_object_minmax
-rw-r--r--source/blender/blenkernel/intern/object.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index e79a759407b..2df78c4fb8a 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -2357,8 +2357,9 @@ void BKE_object_minmax(Object *ob, float min_r[3], float max_r[3], const bool us
/* 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 @@ void BKE_object_minmax(Object *ob, float min_r[3], float max_r[3], const bool us
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 @@ void BKE_object_minmax(Object *ob, float min_r[3], float max_r[3], const bool us
}
}
change = TRUE;
+ break;
}
- break;
case OB_ARMATURE:
+ {
if (ob->pose) {
bArmature *arm = ob->data;
bPoseChannel *pchan;
@@ -2408,6 +2410,7 @@ void BKE_object_minmax(Object *ob, float min_r[3], float max_r[3], const bool us
}
}
break;
+ }
case OB_MESH:
{
Mesh *me = BKE_mesh_from_object(ob);
@@ -2421,8 +2424,8 @@ void BKE_object_minmax(Object *ob, float min_r[3], float max_r[3], const bool us
}
change = TRUE;
}
+ break;
}
- break;
case OB_MBALL:
{
float ob_min[3], ob_max[3];