[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32593] trunk/blender/source/blender/ blenkernel/intern/texture.c: Fix for [#24313] Displacement modifier is not respecting animated texture channels.
Janne Karhu
jhkarh at gmail.com
Tue Oct 19 12:26:54 CEST 2010
Revision: 32593
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32593
Author: jhk
Date: 2010-10-19 12:26:53 +0200 (Tue, 19 Oct 2010)
Log Message:
-----------
Fix for [#24313] Displacement modifier is not respecting animated texture channels.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/texture.c
Modified: trunk/blender/source/blender/blenkernel/intern/texture.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/texture.c 2010-10-19 10:17:19 UTC (rev 32592)
+++ trunk/blender/source/blender/blenkernel/intern/texture.c 2010-10-19 10:26:53 UTC (rev 32593)
@@ -1337,13 +1337,11 @@
else if( texture->ima &&
ELEM(texture->ima->source, IMA_SRC_SEQUENCE, IMA_SRC_MOVIE)) {
return 1;
- }
-#if 0 // XXX old animation system
- else if(texture->ipo) {
- // assume any ipo means the texture is animated
+ }
+ else if(texture->adt) {
+ // assume anything in adt means the texture is animated
return 1;
}
-#endif // XXX old animation system
return 0;
}
More information about the Bf-blender-cvs
mailing list