Merging r36529-38806bge_components

1 files changed, 26 insertions, 0 deletions

diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c
index 9cd07de31dc..036ba34d0c8 100644
--- a/source/blender/blenkernel/intern/texture.c
+++ b/source/blender/blenkernel/intern/texture.c
@@ -1191,6 +1191,28 @@ void set_current_material_texture(Material *ma, Tex *newtex)
 	}
 }
 
+int has_current_material_texture(Material *ma)
+{
+	bNode *node;
+
+	if(ma && ma->use_nodes && ma->nodetree) {
+		node= nodeGetActiveID(ma->nodetree, ID_TE);
+
+		if(node) {
+			return 1;
+		}
+		else {
+			node= nodeGetActiveID(ma->nodetree, ID_MA);
+			if(node)
+				ma= (Material*)node->id;
+			else
+				ma= NULL;
+		}
+	}
+
+	return (ma != NULL);
+}
+
 Tex *give_current_world_texture(World *world)
 {
 	MTex *mtex= NULL;
@@ -1464,6 +1486,10 @@ int BKE_texture_dependsOnTime(const struct Tex *texture)
 		// assume anything in adt means the texture is animated
 		return 1;
 	}
+	else if(texture->type == TEX_NOISE) {
+		// noise always varies with time
+		return 1;
+	}
 	return 0;
 }