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

This commit is contained in:
Campbell Barton
2013-08-06 02:47:47 +00:00
parent 8d6e5606d8
commit 0398ef6ae0
5 changed files with 6 additions and 7 deletions

View File

@@ -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;

View File

@@ -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);

View File

@@ -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;

View File

@@ -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) {

View File

@@ -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 */