diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2008-08-06 08:09:10 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2008-08-06 08:09:10 +0400 |
| commit | 553e35e36f53c881712e86c6c98f49f9e0291f04 (patch) | |
| tree | 00a176353bbdeafc6a2ca5e8bfce22c419d12a97 /source/blender | |
| parent | 028d44c0751ca8bec0a404e0738b5b563222bf84 (diff) | |
* blenderplayer wasnt useing the scenes frame rate.
* GBE Python API's alignToVect wasnt clamping the align ammount from 0.0-1.0
* Generated images arnt animated - use for a test to see if the textures animated.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/intern/texture.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c index b04729d0b46..da1dcfa6c5b 100644 --- a/source/blender/blenkernel/intern/texture.c +++ b/source/blender/blenkernel/intern/texture.c @@ -850,10 +850,8 @@ int BKE_texture_dependsOnTime(const struct Tex *texture) if(texture->plugin) { // assume all plugins depend on time return 1; - } else if(texture->ima && - ( texture->ima->source == IMA_SRC_SEQUENCE || - texture->ima->source == IMA_SRC_MOVIE || - texture->ima->source == IMA_SRC_GENERATED ) ) { + } else if( texture->ima && + ELEM(texture->ima->source, IMA_SRC_SEQUENCE, IMA_SRC_MOVIE)) { return 1; } else if(texture->ipo) { // assume any ipo means the texture is animated |