sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Second fix for [#24476] The driver is not displayed in GraphEditor.

Browse Source 
* Texture data still wasn't shown if material didn't have animation data.
* Also unified the material/texture filtering logic a bit.
This commit is contained in:
Janne Karhu 2010-11-08 09:05:27 +00:00
parent 4d743796fd
commit 3ca44b5d16
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
source/blender/editors/animation/anim_filter.c
View File

@ -1390,22 +1390,6 @@ static int animdata_filter_dopesheet_mats (bAnimContext *ac, ListBase *anim_data
/* 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,
@ -1413,6 +1397,27 @@ static int animdata_filter_dopesheet_mats (bAnimContext *ac, ListBase *anim_data
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 */