[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49256] trunk/blender/source/blender/ editors/animation/anim_filter.c: Display animation data from lamps' node trees in animation editor windows

[Sergey Sharybin]

Revision: 49256
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49256
Author:   nazgul
Date:     2012-07-26 16:11:59 +0000 (Thu, 26 Jul 2012)
Log Message:
-----------
Display animation data from lamps' node trees in animation editor windows

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	2012-07-26 15:51:33 UTC (rev 49255)
+++ trunk/blender/source/blender/editors/animation/anim_filter.c	2012-07-26 16:11:59 UTC (rev 49256)
@@ -1806,11 +1806,18 @@
 		
 		/* sub-data filtering... */
 		switch (ob->type) {
-			case OB_LAMP:  /* lamp - textures */
+			case OB_LAMP:  /* lamp - textures + nodetree */
 			{
+				Lamp *la = ob->data;
+				bNodeTree *ntree = la->nodetree;
+
+				/* nodetree */
+				if ((ntree) && !(ads->filterflag & ADS_FILTER_NONTREE))
+					tmp_items += animdata_filter_ds_nodetree(ac, &tmp_data, ads, &la->id, ntree, filter_mode);
+
 				/* textures */
 				if (!(ads->filterflag & ADS_FILTER_NOTEX))
-					tmp_items += animdata_filter_ds_textures(ac, &tmp_data, ads, ob->data, filter_mode);
+					tmp_items += animdata_filter_ds_textures(ac, &tmp_data, ads, &la->id, filter_mode);
 			}
 			break;
 		}