diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-11-28 20:25:42 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-11-28 20:25:42 +0400 |
| commit | 9c156c550f40287eb0ece662bb8b80df67954f19 (patch) | |
| tree | 9d883627fe6b1eadfd9d3cf23a94de4d8b5aba77 /source | |
| parent | 0b5ba70244605ac8d7bca1589373119c8be84d00 (diff) | |
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.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index ffdb8110edc..1162708f975 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -5793,9 +5793,8 @@ static void draw_bb_quadric(BoundBox *bb, char type) } 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(); |