diff options
author | Nicolai Hähnle <nhaehnle@gmail.com> | 2009-10-07 20:45:08 +0200 |
---|---|---|
committer | Nicolai Hähnle <nhaehnle@gmail.com> | 2009-10-07 20:45:08 +0200 |
commit | 7ca7220ea1d31dbdbf1fe7e6f3e6cc4ff8b0abde (patch) | |
tree | a4e50f36da7c75c945a2418738e2a84af2b3789d /progs/glsl/skinning.c | |
parent | 57abb76e1095d14f54ea8b8d0d2220e209b8656f (diff) | |
parent | 5b4c0b864a25fa193e7ba828cf5ce483ca05bd4e (diff) |
Merge branch 'master' into r300g-glsl
Conflicts:
src/gallium/drivers/r300/r300_tgsi_to_rc.c
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com>
Diffstat (limited to 'progs/glsl/skinning.c')
-rw-r--r-- | progs/glsl/skinning.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/progs/glsl/skinning.c b/progs/glsl/skinning.c index 65ba98348b..2b96f31d06 100644 --- a/progs/glsl/skinning.c +++ b/progs/glsl/skinning.c @@ -16,6 +16,9 @@ #include <GL/glut.h> #include "shaderutil.h" +#ifndef M_PI +#define M_PI 3.1415926535 +#endif static char *FragProgFile = "skinning.frag"; static char *VertProgFile = "skinning.vert"; |