[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29116] branches/branch-farsthary/source/ blender/editors/space_view3d/drawvolume.c: * Renamed a function so that it links properly (under Ubuntu 10.04)

[Nicholas Bishop]

Revision: 29116
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29116
Author:   nicholasbishop
Date:     2010-06-01 04:33:15 +0200 (Tue, 01 Jun 2010)

Log Message:
-----------
* Renamed a function so that it links properly (under Ubuntu 10.04)

Modified Paths:
--------------
    branches/branch-farsthary/source/blender/editors/space_view3d/drawvolume.c

Modified: branches/branch-farsthary/source/blender/editors/space_view3d/drawvolume.c
===================================================================
--- branches/branch-farsthary/source/blender/editors/space_view3d/drawvolume.c	2010-06-01 01:01:25 UTC (rev 29115)
+++ branches/branch-farsthary/source/blender/editors/space_view3d/drawvolume.c	2010-06-01 02:33:15 UTC (rev 29116)
@@ -149,7 +149,7 @@
 	return numpoints;
 }
 
-static int convex(float *p0, float *up, float *a, float *b)
+static int drawvolume_convex(float *p0, float *up, float *a, float *b)
 {
 	// Vec3 va = a-p0, vb = b-p0;
 	float va[3], vb[3], tmp[3];
@@ -422,7 +422,7 @@
 			{
 				for(j = i + 1; j < numpoints; j++)
 				{
-					if(!convex(p0, viewnormal, &points[j * 3], &points[i * 3]))
+					if(!drawvolume_convex(p0, viewnormal, &points[j * 3], &points[i * 3]))
 					{
 						float tmp2[3];
 						VECCOPY(tmp2, &points[j * 3]);