[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48301] branches/soc-2012-swiss_cheese/ source/blender/gpu/intern/gpu_primitives.c: fixed some brain dead code that only worked by virtue of only being tested for a single case .
Jason Wilkins
Jason.A.Wilkins at gmail.com
Tue Jun 26 09:29:37 CEST 2012
Revision: 48301
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48301
Author: jwilkins
Date: 2012-06-26 07:29:35 +0000 (Tue, 26 Jun 2012)
Log Message:
-----------
fixed some brain dead code that only worked by virtue of only being tested for a single case.
Modified Paths:
--------------
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_primitives.c
Modified: branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_primitives.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_primitives.c 2012-06-26 07:27:17 UTC (rev 48300)
+++ branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_primitives.c 2012-06-26 07:29:35 UTC (rev 48301)
@@ -939,16 +939,16 @@
GLfloat angleMin;
GLfloat angleMax;
GLfloat vSweepAngle;
- GLfloat vecMin[3] = { 0, 0, zMin };
- GLfloat vecMax[3] = { 0, 0, zMax };
+ GLfloat zMinNorm;
+ GLfloat zMaxNorm;
GLfloat vFracAngle;
GLfloat zDiff;
- normalize_v3(vecMin);
- angleMin = asinf(vecMin[2]);
+ zMinNorm = zMin / prim->params.sphere.radius;
+ angleMin = asinf(zMinNorm);
- normalize_v3(vecMax);
- angleMax = asinf(vecMax[2]);
+ zMaxNorm = zMax / prim->params.sphere.radius;
+ angleMax = asinf(zMaxNorm);
vSweepAngle = angleMax - angleMin;
@@ -1215,7 +1215,7 @@
copy_v3_flflfl(prim->params.sweep.point1, radiusBase, 0, 0);
copy_v3_flflfl(prim->params.sweep.point2, radiusTop, 0, height);
- shape3(prim, sweep, NULL, 0, height, GL_FALSE);
+ shape3(prim, sweep, NULL, 0, height, GL_TRUE);
}
More information about the Bf-blender-cvs
mailing list