Fix compiler warnings from earlier commit.

2 files changed, 9 insertions, 18 deletions

diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index 2cb64896d87..1dc76296c28 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -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"
diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c
index 44342c02676..b04729d0b46 100644
--- a/source/blender/blenkernel/intern/texture.c
+++ b/source/blender/blenkernel/intern/texture.c
@@ -847,29 +847,19 @@ void BKE_free_envmap(EnvMap *env)
 /* ------------------------------------------------------------------------- */
 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;
 }
 
 /* ------------------------------------------------------------------------- */