code clenup: remove benchmarking left in by accident and GPU print, also some minor style edits

5 files changed, 6 insertions, 7 deletions

diff --git a/source/blender/blenkernel/intern/shrinkwrap.c b/source/blender/blenkernel/intern/shrinkwrap.c
index 42d3b841799..b9843ad0619 100644
--- a/source/blender/blenkernel/intern/shrinkwrap.c
+++ b/source/blender/blenkernel/intern/shrinkwrap.c
@@ -428,7 +428,7 @@ static void shrinkwrap_calc_nearest_surface_point(ShrinkwrapCalcData *calc)
 	BVHTreeNearest nearest  = NULL_BVHTreeNearest;
 
 	/* Create a bvh-tree of the given target */
-	TIMEIT_BENCH(bvhtree_from_mesh_faces(&treeData, calc->target, 0.0, 2, 6), bvhtree_faces);
+	bvhtree_from_mesh_faces(&treeData, calc->target, 0.0, 2, 6);
 	if (treeData.tree == NULL) {
 		OUT_OF_MEMORY();
 		return;
diff --git a/source/blender/editors/armature/armature_select.c b/source/blender/editors/armature/armature_select.c
index f2b3ce206f1..fe1d2fa3765 100644
--- a/source/blender/editors/armature/armature_select.c
+++ b/source/blender/editors/armature/armature_select.c
@@ -714,10 +714,10 @@ static void armature_select_less(bArmature *UNUSED(arm), EditBone *ebone)
 	}
 }
 
-static void armature_select_more_less(Object* ob, bool more)
+static void armature_select_more_less(Object *ob, bool more)
 {
-	bArmature* arm = (bArmature *)ob->data;
-	EditBone* ebone;
+	bArmature *arm = (bArmature *)ob->data;
+	EditBone *ebone;
 
 	/* XXX, eventually we shouldn't need this - campbell */
 	ED_armature_sync_selection(arm->edbo);
diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c
index b4532e0571c..e21e889d99d 100644
--- a/source/blender/editors/render/render_opengl.c
+++ b/source/blender/editors/render/render_opengl.c
@@ -684,6 +684,7 @@ static int screen_opengl_render_modal(bContext *C, wmOperator *op, const wmEvent
 			/* render frame? */
 			if (oglrender->timer == event->customdata)
 				break;
+			/* fall-through */
 		default:
 			/* nothing to do */
 			return OPERATOR_RUNNING_MODAL;
diff --git a/source/blender/editors/space_node/node_add.c b/source/blender/editors/space_node/node_add.c
index 4c40b6c412b..c9618daa7c5 100644
--- a/source/blender/editors/space_node/node_add.c
+++ b/source/blender/editors/space_node/node_add.c
@@ -437,7 +437,7 @@ static int node_add_mask_invoke(bContext *C, wmOperator *op, const wmEvent *even
 
 	/* convert mouse coordinates to v2d space */
 	UI_view2d_region_to_view(&ar->v2d, event->mval[0], event->mval[1],
-							 &snode->cursor[0], &snode->cursor[1]);
+	                         &snode->cursor[0], &snode->cursor[1]);
 	node = node_add_node(C, NULL, CMP_NODE_MASK, snode->cursor[0], snode->cursor[1]);
 
 	if (!node) {
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 2b47d12ebba..3f2a0910e1a 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -531,8 +531,6 @@ static void drawfloor(Scene *scene, View3D *v3d, const char **grid_unit)
 		}
 
 		glDisableClientState(GL_VERTEX_ARRAY);
-
-		GPU_print_error("sdsd");
 	}
 	
 	/* draw the Z axis line */