Revision: 15979
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15979
Author: khughes
Date: 2008-08-06 00:13:13 +0200 (Wed, 06 Aug 2008)
Log Message:
-----------
Fix compiler warnings from earlier commit.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/modifier.c
trunk/blender/source/blender/blenkernel/intern/texture.c
Modified: trunk/blender/source/blender/blenkernel/intern/modifier.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/modifier.c 2008-08-05
21:20:14 UTC (rev 15978)
+++ trunk/blender/source/blender/blenkernel/intern/modifier.c 2008-08-05
22:13:13 UTC (rev 15979)
@@ -97,6 +97,7 @@
#include "BKE_material.h"
#include "BKE_particle.h"
#include "BKE_pointcache.h"
+#include "BKE_texture.h"
#include "BKE_utildefines.h"
#include "depsgraph_private.h"
#include "BKE_bmesh.h"
Modified: trunk/blender/source/blender/blenkernel/intern/texture.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/texture.c 2008-08-05
21:20:14 UTC (rev 15978)
+++ trunk/blender/source/blender/blenkernel/intern/texture.c 2008-08-05
22:13:13 UTC (rev 15979)
@@ -847,29 +847,19 @@
/* ------------------------------------------------------------------------- */
int BKE_texture_dependsOnTime(const struct Tex *texture)
{
- if(texture->plugin)
- {
+ if(texture->plugin) {
// assume all plugins depend on time
return 1;
- }
- else if(texture->ima)
- {
- if(texture->ima->source == IMA_SRC_SEQUENCE ||
- texture->ima->source == IMA_SRC_MOVIE ||
- texture->ima->source == IMA_SRC_GENERATED)
- {
- return 1;
- }
- }
- else if(texture->ipo)
- {
+ } else if(texture->ima &&
+ ( texture->ima->source == IMA_SRC_SEQUENCE ||
+ texture->ima->source == IMA_SRC_MOVIE ||
+ texture->ima->source == IMA_SRC_GENERATED )
) {
+ return 1;
+ } else if(texture->ipo) {
// assume any ipo means the texture is animated
return 1;
}
- else
- {
- return 0;
- }
+ return 0;
}
/* ------------------------------------------------------------------------- */
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
