Revision: 58953
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58953
Author: campbellbarton
Date: 2013-08-06 02:47:47 +0000 (Tue, 06 Aug 2013)
Log Message:
-----------
code clenup: remove benchmarking left in by accident and GPU print, also some
minor style edits
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c
trunk/blender/source/blender/editors/armature/armature_select.c
trunk/blender/source/blender/editors/render/render_opengl.c
trunk/blender/source/blender/editors/space_node/node_add.c
trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
Modified: trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c 2013-08-06
02:37:02 UTC (rev 58952)
+++ trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c 2013-08-06
02:47:47 UTC (rev 58953)
@@ -428,7 +428,7 @@
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;
Modified: trunk/blender/source/blender/editors/armature/armature_select.c
===================================================================
--- trunk/blender/source/blender/editors/armature/armature_select.c
2013-08-06 02:37:02 UTC (rev 58952)
+++ trunk/blender/source/blender/editors/armature/armature_select.c
2013-08-06 02:47:47 UTC (rev 58953)
@@ -714,10 +714,10 @@
}
}
-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);
Modified: trunk/blender/source/blender/editors/render/render_opengl.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_opengl.c 2013-08-06
02:37:02 UTC (rev 58952)
+++ trunk/blender/source/blender/editors/render/render_opengl.c 2013-08-06
02:47:47 UTC (rev 58953)
@@ -684,6 +684,7 @@
/* render frame? */
if (oglrender->timer == event->customdata)
break;
+ /* fall-through */
default:
/* nothing to do */
return OPERATOR_RUNNING_MODAL;
Modified: trunk/blender/source/blender/editors/space_node/node_add.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_add.c 2013-08-06
02:37:02 UTC (rev 58952)
+++ trunk/blender/source/blender/editors/space_node/node_add.c 2013-08-06
02:47:47 UTC (rev 58953)
@@ -437,7 +437,7 @@
/* 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) {
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
2013-08-06 02:37:02 UTC (rev 58952)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
2013-08-06 02:47:47 UTC (rev 58953)
@@ -531,8 +531,6 @@
}
glDisableClientState(GL_VERTEX_ARRAY);
-
- GPU_print_error("sdsd");
}
/* draw the Z axis line */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
