[Bf-blender-cvs] [af704c6] master: Style cleanup

[Campbell Barton]

Commit: af704c6d88f7db3e1e6f29f0b4ce297a176f4b30
Author: Campbell Barton
Date:   Wed May 7 06:11:28 2014 +1000
https://developer.blender.org/rBaf704c6d88f7db3e1e6f29f0b4ce297a176f4b30

Style cleanup

===================================================================

M	source/blender/blenkernel/BKE_pbvh.h
M	source/blender/blenkernel/intern/pbvh.c
M	source/blender/editors/armature/armature_utils.c
M	source/blender/editors/space_nla/nla_channels.c

===================================================================

diff --git a/source/blender/blenkernel/BKE_pbvh.h b/source/blender/blenkernel/BKE_pbvh.h
index c163054..619b1af 100644
--- a/source/blender/blenkernel/BKE_pbvh.h
+++ b/source/blender/blenkernel/BKE_pbvh.h
@@ -129,8 +129,8 @@ void BKE_pbvh_bounding_box(const PBVH *bvh, float min[3], float max[3]);
 unsigned int **BKE_pbvh_grid_hidden(const PBVH *bvh);
 
 int BKE_pbvh_count_grid_quads(BLI_bitmap **grid_hidden,
-								int *grid_indices, int totgrid,
-								int gridsize);
+                              int *grid_indices, int totgrid,
+                              int gridsize);
 
 /* multires level, only valid for type == PBVH_GRIDS */
 void BKE_pbvh_get_grid_key(const PBVH *pbvh, struct CCGKey *key);
diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c
index 7de361d..45de144 100644
--- a/source/blender/blenkernel/intern/pbvh.c
+++ b/source/blender/blenkernel/intern/pbvh.c
@@ -296,7 +296,7 @@ static void build_mesh_leaf_node(PBVH *bvh, PBVHNode *node)
 			                        &node->uniq_verts, (&f->v1)[j]);
 		}
 
-		if(!paint_is_face_hidden(f, bvh->verts))
+		if (!paint_is_face_hidden(f, bvh->verts))
 			has_visible = true;
 	}
 
@@ -354,8 +354,8 @@ static void update_vb(PBVH *bvh, PBVHNode *node, BBC *prim_bbc,
 
 /* Returns the number of visible quads in the nodes' grids. */
 int BKE_pbvh_count_grid_quads(BLI_bitmap **grid_hidden,
-								int *grid_indices, int totgrid,
-								int gridsize)
+                              int *grid_indices, int totgrid,
+                              int gridsize)
 {
 	int gridarea = (gridsize - 1) * (gridsize - 1);
 	int i, x, y, totquad;
@@ -385,7 +385,7 @@ int BKE_pbvh_count_grid_quads(BLI_bitmap **grid_hidden,
 static void build_grid_leaf_node(PBVH *bvh, PBVHNode *node)
 {
 	int totquads = BKE_pbvh_count_grid_quads(bvh->grid_hidden, node->prim_indices,
-											 node->totprim, bvh->gridkey.grid_size);
+	                                         node->totprim, bvh->gridkey.grid_size);
 	BKE_pbvh_node_fully_hidden_set(node, (totquads == 0));
 	BKE_pbvh_node_mark_rebuild_draw(node);
 }
@@ -1079,7 +1079,7 @@ static void pbvh_update_draw_buffers(PBVH *bvh, PBVHNode **nodes, int totnode)
 						GPU_build_grid_pbvh_buffers(node->prim_indices,
 					                           node->totprim,
 					                           bvh->grid_hidden,
-											   bvh->gridkey.grid_size);
+					                           bvh->gridkey.grid_size);
 					break;
 				case PBVH_FACES:
 					node->draw_buffers =
diff --git a/source/blender/editors/armature/armature_utils.c b/source/blender/editors/armature/armature_utils.c
index f22e668..97f69d8 100644
--- a/source/blender/editors/armature/armature_utils.c
+++ b/source/blender/editors/armature/armature_utils.c
@@ -507,7 +507,7 @@ static void fix_bonelist_roll(ListBase *bonelist, ListBase *editbonelist)
 			print_m4("difmat", difmat);
 			printf("Roll = %f\n",  RAD2DEGF(-atan2(difmat[2][0], difmat[2][2])));
 #endif
-			curBone->roll = (float)-atan2(difmat[2][0], difmat[2][2]);
+			curBone->roll = -atan2f(difmat[2][0], difmat[2][2]);
 			
 			/* and set restposition again */
 			BKE_armature_where_is_bone(curBone, curBone->parent);
diff --git a/source/blender/editors/space_nla/nla_channels.c b/source/blender/editors/space_nla/nla_channels.c
index be4d197..16572f1 100644
--- a/source/blender/editors/space_nla/nla_channels.c
+++ b/source/blender/editors/space_nla/nla_channels.c
@@ -494,7 +494,7 @@ void NLA_OT_action_pushdown(wmOperatorType *ot)
 	/* properties */
 	ot->prop = RNA_def_int(ot->srna, "channel_index", -1, -1, INT_MAX, "Channel Index",
 	                       "Index of NLA action channel to perform pushdown operation on",
-						   0, INT_MAX);
+	                       0, INT_MAX);
 	RNA_def_property_flag(ot->prop, PROP_SKIP_SAVE);
 }