diff options
author | Brian <brian.paul@tungstengraphics.com> | 2007-07-24 09:17:59 -0600 |
---|---|---|
committer | Brian <brian.paul@tungstengraphics.com> | 2007-07-24 09:17:59 -0600 |
commit | 5b737b7df21b418c71f71af987a20c495b1133f8 (patch) | |
tree | 6aa3a54cb5d3c43f789488147f3b61b56e09c5fc /progs/demos/morph3d.c | |
parent | f0636d9653d142bdf71475d2d2066f5c7c436978 (diff) | |
parent | 98eaf5503d0d7c4f18fab6910a08aba7a3d08639 (diff) |
Merge branch 'softpipe_0_1_branch' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa into softpipe_0_1_branch
Diffstat (limited to 'progs/demos/morph3d.c')
-rw-r--r-- | progs/demos/morph3d.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/progs/demos/morph3d.c b/progs/demos/morph3d.c index 162a6ff847..6aca8270ff 100644 --- a/progs/demos/morph3d.c +++ b/progs/demos/morph3d.c @@ -826,7 +826,7 @@ static void pinit(void) } -static void INIT(void) +int main(int argc, char **argv) { printf("Morph 3D - Shows morphing platonic polyhedra\n"); printf("Author: Marcelo Fernandes Vianna (vianna@cat.cbpf.br)\n\n"); @@ -841,6 +841,7 @@ static void INIT(void) object=1; + glutInit(&argc, argv); glutInitWindowPosition(0,0); glutInitWindowSize(640,480); @@ -888,9 +889,3 @@ static void INIT(void) glutMainLoop(); } - -int main(int argc, char **argv) -{ - INIT(); - return(0); -} |