Revision: 37842
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37842
Author: aligorith
Date: 2011-06-27 04:46:03 +0000 (Mon, 27 Jun 2011)
Log Message:
-----------
Texture Nodes AnimEdit support
Modified Paths:
--------------
branches/soc-2011-pepper/source/blender/editors/animation/anim_filter.c
branches/soc-2011-pepper/source/blender/editors/space_nla/nla_draw.c
Modified:
branches/soc-2011-pepper/source/blender/editors/animation/anim_filter.c
===================================================================
--- branches/soc-2011-pepper/source/blender/editors/animation/anim_filter.c
2011-06-27 04:24:59 UTC (rev 37841)
+++ branches/soc-2011-pepper/source/blender/editors/animation/anim_filter.c
2011-06-27 04:46:03 UTC (rev 37842)
@@ -1365,7 +1365,16 @@
/* add texture's animation data to temp collection */
BEGIN_ANIMFILTER_SUBCHANNELS(FILTER_TEX_DATA(tex))
{
+ /* texture animdata */
tmp_items += animfilter_block_data(ac, &tmp_data, ads,
(ID *)tex, filter_mode);
+
+ /* nodes */
+ if ((tex->nodetree) && !(ads->filterflag &
ADS_FILTER_NONTREE)) {
+ /* owner_id as id instead of texture, since
it'll otherwise be impossible to track the depth */
+ // FIXME: perhaps as a result, textures should
NOT be included under materials, but under their own section instead
+ // so that free-floating textures can also be
animated
+ tmp_items += animdata_filter_ds_nodetree(ac,
&tmp_data, ads, (ID *)tex, tex->nodetree, filter_mode);
+ }
}
END_ANIMFILTER_SUBCHANNELS;
@@ -1415,9 +1424,8 @@
tmp_items += animdata_filter_ds_textures(ac,
&tmp_data, ads, (ID *)ma, filter_mode);
/* nodes */
- if ((ma->nodetree) && !(ads->filterflag &
ADS_FILTER_NONTREE)) {
+ if ((ma->nodetree) && !(ads->filterflag &
ADS_FILTER_NONTREE))
tmp_items += animdata_filter_ds_nodetree(ac,
&tmp_data, ads, (ID *)ma, ma->nodetree, filter_mode);
- }
}
END_ANIMFILTER_SUBCHANNELS;
Modified: branches/soc-2011-pepper/source/blender/editors/space_nla/nla_draw.c
===================================================================
--- branches/soc-2011-pepper/source/blender/editors/space_nla/nla_draw.c
2011-06-27 04:24:59 UTC (rev 37841)
+++ branches/soc-2011-pepper/source/blender/editors/space_nla/nla_draw.c
2011-06-27 04:46:03 UTC (rev 37842)
@@ -625,6 +625,14 @@
}
break;
+ case
NTREE_TEXTURE:
+ {
+ /* even
more */
+ offset=
21;
+ indent=
1;
+ }
+ break;
+
default:
/*
normal will do */
offset=
14;
@@ -692,6 +700,14 @@
}
break;
+ case
NTREE_TEXTURE:
+ {
+ /* even
more */
+ offset=
21;
+ indent=
1;
+ }
+ break;
+
default:
/*
normal will do */
offset=
14;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
