[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20729] branches/soc-2009-aligorith/source /blender: NLA SoC: Fixed Outliner drawing for NLA data, and set icons for RNA wrapping of this data...

[Joshua Leung]

Revision: 20729
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20729
Author:   aligorith
Date:     2009-06-08 13:11:39 +0200 (Mon, 08 Jun 2009)

Log Message:
-----------
NLA SoC: Fixed Outliner drawing for NLA data, and set icons for RNA wrapping of this data...

Modified Paths:
--------------
    branches/soc-2009-aligorith/source/blender/editors/space_outliner/outliner.c
    branches/soc-2009-aligorith/source/blender/editors/space_outliner/outliner_intern.h
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_nla.c

Modified: branches/soc-2009-aligorith/source/blender/editors/space_outliner/outliner.c
===================================================================
--- branches/soc-2009-aligorith/source/blender/editors/space_outliner/outliner.c	2009-06-08 11:04:05 UTC (rev 20728)
+++ branches/soc-2009-aligorith/source/blender/editors/space_outliner/outliner.c	2009-06-08 11:11:39 UTC (rev 20729)
@@ -949,7 +949,6 @@
 		
 		/* NLA Data */
 		if (adt->nla_tracks.first) {
-#if 0
 			TreeElement *tenla= outliner_add_element(soops, &te->subtree, adt, te, TSE_NLA, 0);
 			NlaTrack *nlt;
 			int a= 0;
@@ -957,17 +956,18 @@
 			tenla->name= "NLA Tracks";
 			
 			for (nlt= adt->nla_tracks.first; nlt; nlt= nlt->next) {
-				TreeElement *tenlt= outliner_add_element(soops, &te->subtree, nlt, te, TSE_NLA_TRACK, a);
-				bActionStrip *strip;
+				TreeElement *tenlt= outliner_add_element(soops, &tenla->subtree, nlt, tenla, TSE_NLA_TRACK, a);
+				NlaStrip *strip;
 				TreeElement *ten;
 				int b= 0;
 				
-				for (strip=nlt->strips.first; strip; strip=strip->next, a++) {
-					ten= outliner_add_element(soops, &tenla->subtree, strip->act, tenla, TSE_NLA_ACTION, a);
+				tenlt->name= nlt->name;
+				
+				for (strip=nlt->strips.first; strip; strip=strip->next, b++) {
+					ten= outliner_add_element(soops, &tenlt->subtree, strip->act, tenlt, TSE_NLA_ACTION, b);
 					if(ten) ten->directdata= strip;
 				}
 			}
-#endif
 		}
 	}
 	else if(type==TSE_SEQUENCE) {
@@ -3521,6 +3521,8 @@
 				UI_icon_draw(x, y, ICON_ANIM_DATA); break; // xxx
 			case TSE_NLA:
 				UI_icon_draw(x, y, ICON_NLA); break;
+			case TSE_NLA_TRACK:
+				UI_icon_draw(x, y, ICON_NLA); break; // XXX
 			case TSE_NLA_ACTION:
 				UI_icon_draw(x, y, ICON_ACTION); break;
 			case TSE_DEFGROUP_BASE:

Modified: branches/soc-2009-aligorith/source/blender/editors/space_outliner/outliner_intern.h
===================================================================
--- branches/soc-2009-aligorith/source/blender/editors/space_outliner/outliner_intern.h	2009-06-08 11:04:05 UTC (rev 20728)
+++ branches/soc-2009-aligorith/source/blender/editors/space_outliner/outliner_intern.h	2009-06-08 11:11:39 UTC (rev 20729)
@@ -94,6 +94,7 @@
 #define TSE_RNA_STRUCT		30
 #define TSE_RNA_PROPERTY	31
 #define TSE_RNA_ARRAY_ELEM	32
+#define TSE_NLA_TRACK		33
 
 /* outliner search flags */
 #define OL_FIND					0

Modified: branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_nla.c
===================================================================
--- branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_nla.c	2009-06-08 11:04:05 UTC (rev 20728)
+++ branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_nla.c	2009-06-08 11:11:39 UTC (rev 20729)
@@ -155,7 +155,7 @@
 	/* struct definition */
 	srna= RNA_def_struct(brna, "NlaStrip", NULL);
 	RNA_def_struct_ui_text(srna, "NLA Strip", "A container referencing an existing Action.");
-	//RNA_def_struct_ui_icon(srna, ICON_ACTION);
+	RNA_def_struct_ui_icon(srna, ICON_NLA); // XXX
 	
 	/* Enums */
 	prop= RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE);
@@ -281,7 +281,7 @@
 	
 	srna= RNA_def_struct(brna, "NlaTrack", NULL);
 	RNA_def_struct_ui_text(srna, "NLA Track", "A animation layer containing Actions referenced as NLA strips.");
-	//RNA_def_struct_ui_icon(srna, ICON_ACTION);
+	RNA_def_struct_ui_icon(srna, ICON_NLA);
 	
 	/* strips collection */
 	prop= RNA_def_property(srna, "strips", PROP_COLLECTION, PROP_NONE);