[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32941] trunk/blender/source/blender/ editors/animation/anim_filter.c: Second fix for [#24476] The driver is not displayed in GraphEditor.

[Janne Karhu]

Revision: 32941
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32941
Author:   jhk
Date:     2010-11-08 10:05:27 +0100 (Mon, 08 Nov 2010)

Log Message:
-----------
Second fix for [#24476] The driver is not displayed in GraphEditor.
* Texture data still wasn't shown if material didn't have animation data.
* Also unified the material/texture filtering logic a bit.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/animation/anim_filter.c

Modified: trunk/blender/source/blender/editors/animation/anim_filter.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_filter.c	2010-11-08 07:59:34 UTC (rev 32940)
+++ trunk/blender/source/blender/editors/animation/anim_filter.c	2010-11-08 09:05:27 UTC (rev 32941)
@@ -1390,29 +1390,34 @@
 		
 		/* for now, if no material returned, skip (this shouldn't confuse the user I hope) */
 		if (ma == NULL) continue;
-		if (ma->adt == NULL) {
-			/* need to check textures */
-			if(ma->mtex) {
-				MTex **mtex = ma->mtex;
-				int mtInd;
-				for (mtInd=0; mtInd < MAX_MTEX; mtInd++) {
-					if (ELEM3(NULL, mtex[mtInd], mtex[mtInd]->tex, mtex[mtInd]->tex->adt))
-						continue;
-					else
-						ok=1;
-				}
-			}
-			else
-				continue;
-		}
-		
-		
+
 		/* check if ok */
 		ANIMDATA_FILTER_CASES(ma, 
 			{ /* AnimData blocks - do nothing... */ },
 			ok=1;, 
 			ok=1;, 
 			ok=1;)
+
+		/* need to check textures */
+		if (ok == 0 && !(ads->filterflag & ADS_FILTER_NOTEX)) {
+			int mtInd;
+
+			for (mtInd=0; mtInd < MAX_MTEX; mtInd++) {
+				MTex *mtex = ma->mtex[mtInd];
+
+				if(mtex && mtex->tex) {
+					ANIMDATA_FILTER_CASES(mtex->tex,
+					{ /* AnimData blocks - do nothing... */ },
+					ok=1;, 
+					ok=1;, 
+					ok=1;)
+				}
+
+				if(ok)
+					break;
+			}
+		}
+		
 		if (ok == 0) continue;
 		
 		/* make a temp list elem for this */