[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60873] trunk/blender/source/blender/ editors/animation/anim_filter.c: Project Pampa request: show curves for node grupps

[Sergey Sharybin]

Revision: 60873
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60873
Author:   nazgul
Date:     2013-10-20 17:53:29 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
Project Pampa request: show curves for node grupps

It was not implemented in anim filter yet.

it's strictly speaking not so much clear how
"selected only" mode is expected to work when
having multiple node trees editing at the same
time. For now all the animation data from
selected group will be displayed.

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	2013-10-20 14:42:26 UTC (rev 60872)
+++ trunk/blender/source/blender/editors/animation/anim_filter.c	2013-10-20 17:53:29 UTC (rev 60873)
@@ -1503,8 +1503,7 @@
 }
 
 /* NOTE: owner_id is scene, material, or texture block, which is the direct owner of the node tree in question */
-// TODO: how to handle group nodes is still unclear...
-static size_t animdata_filter_ds_nodetree(bAnimContext *ac, ListBase *anim_data, bDopeSheet *ads, ID *owner_id, bNodeTree *ntree, int filter_mode)
+static size_t animdata_filter_ds_nodetree_group(bAnimContext *ac, ListBase *anim_data, bDopeSheet *ads, ID *owner_id, bNodeTree *ntree, int filter_mode)
 {
 	ListBase tmp_data = {NULL, NULL};
 	size_t tmp_items = 0;
@@ -1538,6 +1537,32 @@
 	return items;
 }
 
+static size_t animdata_filter_ds_nodetree(bAnimContext *ac, ListBase *anim_data, bDopeSheet *ads, ID *owner_id, bNodeTree *ntree, int filter_mode)
+{
+	bNode *node;
+	size_t items = 0;
+	int group_filter_mode = filter_mode & ~ADS_FILTER_ONLYSEL;
+
+	items += animdata_filter_ds_nodetree_group(ac, anim_data, ads, owner_id, ntree, filter_mode);
+
+	for (node = ntree->nodes.first; node; node = node->next) {
+		if (node->type == NODE_GROUP) {
+			if (node->id) {
+				int filterflag = ads->filterflag;
+				if ((filter_mode & ADS_FILTER_ONLYSEL) && (node->flag & NODE_SELECT) == 0) {
+					continue;
+				}
+				/* TODO(sergey): A bit creepy, but this flag is not used from threads anyway. */
+				ads->filterflag &= ~ADS_FILTER_ONLYSEL;
+				items += animdata_filter_ds_nodetree_group(ac, anim_data, ads, owner_id, (bNodeTree *) node->id, group_filter_mode);
+				ads->filterflag = filterflag;
+			}
+		}
+	}
+
+	return items;
+}
+
 static size_t animdata_filter_ds_linestyle(bAnimContext *ac, ListBase *anim_data, bDopeSheet *ads, Scene *sce, int filter_mode)
 {
 	SceneRenderLayer *srl;