projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Hopefully I did THIS one right (used 'cvs update' to Merge)
[freeglut]
/
freeglut-1.3
/
freeglut_teapot.c
diff --git
a/freeglut-1.3/freeglut_teapot.c
b/freeglut-1.3/freeglut_teapot.c
index
d910a08
..
f855056
100644
(file)
--- a/
freeglut-1.3/freeglut_teapot.c
+++ b/
freeglut-1.3/freeglut_teapot.c
@@
-79,8
+79,10
@@
#define G_LOG_DOMAIN "freeglut-teapot"
#include "../include/GL/freeglut.h"
#define G_LOG_DOMAIN "freeglut-teapot"
#include "../include/GL/freeglut.h"
-#include "../include/GL/freeglut_internal.h"
-
+#include "freeglut_internal.h"
+#ifdef TARGET_HOST_WIN32
+#pragma warning ( once:4305 )
+#endif
/* -- PRIVATE FUNCTIONS ---------------------------------------------------- */
/* -- PRIVATE FUNCTIONS ---------------------------------------------------- */
@@
-166,7
+168,7
@@
static void teapot( GLint grid, GLdouble scale, GLenum type )
glPushMatrix();
glRotatef(270.0, 1.0, 0.0, 0.0);
glPushMatrix();
glRotatef(270.0, 1.0, 0.0, 0.0);
- glScalef(0.5 * scale, 0.5 * scale, 0.5 * scale);
+ glScaled(0.5 * scale, 0.5 * scale, 0.5 * scale);
glTranslatef(0.0, 0.0, -1.5);
for (i = 0; i < 10; i++) {
glTranslatef(0.0, 0.0, -1.5);
for (i = 0; i < 10; i++) {