[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42220] trunk/blender/source/blender/ editors/space_view3d/drawobject.c: Fix #29434: Cone collision bounds is on the wrong axis

[Sergey Sharybin]

Revision: 42220
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42220
Author:   nazgul
Date:     2011-11-28 16:25:42 +0000 (Mon, 28 Nov 2011)
Log Message:
-----------
Fix #29434: Cone collision bounds is on the wrong axis

Because of strange reason, cone boundbox was rotated and it wasn't
reflecting physics engine which used "correct" cone boundbox.

Changed displaying of cone bounding box type.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/drawobject.c

Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c	2011-11-28 16:10:50 UTC (rev 42219)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c	2011-11-28 16:25:42 UTC (rev 42220)
@@ -5793,9 +5793,8 @@
 	}
 	else if(type==OB_BOUND_CONE) {
 		float radius = size[0] > size[1] ? size[0] : size[1];
-		glTranslatef(cent[0], cent[2]-size[2], cent[1]);
-		glScalef(radius, 2.0f * size[2], radius);
-		glRotatef(-90., 1.0, 0.0, 0.0);
+		glTranslatef(cent[0], cent[1], cent[2]-size[2]);
+		glScalef(radius, radius, 2.0f * size[2]);
 		gluCylinder(qobj, 1.0, 0.0, 1.0, 8, 1);
 	}
 	glPopMatrix();