diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-06-17 18:21:33 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-06-17 18:21:33 +0400 |
| commit | 3caa27fa2433bed84d6be79cda4004c20187d9f0 (patch) | |
| tree | 57493bd435d1e7cf2def440391f4842e5f0f658d /source/blender/src/playanim.c | |
| parent | e414d79808126e33b896e45e97bd9046a46598aa (diff) | |
Apricot Branch: GLSL
====================
* Added support for the ColorRamp node.
* Added less than / greather than in the Math node.
* Added support for all blend modes of the Mix node and
all blend modes in the texture stack.
* Added more Map To support, now available:
Col, Nor, Csp, Ref, Spec, Amb, Hard, Alpha, Emit.
* Possible fix for a GLEW / opengl include conflict on
Mac OS X in playanim.c
Diffstat (limited to 'source/blender/src/playanim.c')
| -rw-r--r-- | source/blender/src/playanim.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/src/playanim.c b/source/blender/src/playanim.c index 05540e29298..8421101f66c 100644 --- a/source/blender/src/playanim.c +++ b/source/blender/src/playanim.c @@ -45,15 +45,6 @@ #endif #include "MEM_guardedalloc.h" -#ifdef WITH_QUICKTIME -#ifdef _WIN32 -#include <QTML.h> -#include <Movies.h> -#elif defined(__APPLE__) -#include <QuickTime/Movies.h> -#endif /* __APPLE__ */ -#endif /* WITH_QUICKTIME */ - #include "PIL_time.h" #include <math.h> @@ -77,6 +68,15 @@ #include "BMF_Api.h" +#ifdef WITH_QUICKTIME +#ifdef _WIN32 +#include <QTML.h> +#include <Movies.h> +#elif defined(__APPLE__) +#include <QuickTime/Movies.h> +#endif /* __APPLE__ */ +#endif /* WITH_QUICKTIME */ + #include "playanim_ext.h" #include "mydevice.h" #include "blendef.h" |