[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26497] trunk/blender/source/blender/ editors/space_nla/nla_edit.c: NLA Editor Bugfix:

[Joshua Leung]

Revision: 26497
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26497
Author:   aligorith
Date:     2010-02-01 10:26:50 +0100 (Mon, 01 Feb 2010)

Log Message:
-----------
NLA Editor Bugfix:

Operator to add action-clips now takes names without needing the "AC" prefix. The previous way was non-obvious for scripting usage, but did not cause too much trouble to replace.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_nla/nla_edit.c

Modified: trunk/blender/source/blender/editors/space_nla/nla_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_nla/nla_edit.c	2010-02-01 09:11:18 UTC (rev 26496)
+++ trunk/blender/source/blender/editors/space_nla/nla_edit.c	2010-02-01 09:26:50 UTC (rev 26497)
@@ -247,6 +247,7 @@
 /* Add a new Action-Clip strip to the active track (or the active block if no space in the track) */
 
 /* pop up menu allowing user to choose the action to use */
+// TODO: at some point, we may have to migrate to a search menu to manage the case where there are many actions
 static int nlaedit_add_actionclip_invoke (bContext *C, wmOperator *op, wmEvent *evt)
 {
 	Main *m= CTX_data_main(C);
@@ -259,7 +260,7 @@
 	
 	/* loop through Actions in Main database, adding as items in the menu */
 	for (act= m->action.first; act; act= act->id.next)
-		uiItemStringO(layout, act->id.name+2, 0, "NLA_OT_actionclip_add", "action", act->id.name);
+		uiItemStringO(layout, act->id.name+2, 0, "NLA_OT_actionclip_add", "action", act->id.name+2);
 	uiItemS(layout);
 	
 	uiPupMenuEnd(C, pup);
@@ -278,7 +279,7 @@
 	int filter, items;
 	
 	bAction *act = NULL;
-	char actname[22];
+	char actname[20];
 	float cfra;
 	
 	/* get editor data */
@@ -290,7 +291,7 @@
 		
 	/* get action to use */
 	RNA_string_get(op->ptr, "action", actname);
-	act= (bAction *)find_id("AC", actname+2);
+	act= (bAction *)find_id("AC", actname);
 	
 	if (act == NULL) {
 		BKE_report(op->reports, RPT_ERROR, "No valid Action to add.");
@@ -364,7 +365,7 @@
 	
 	/* props */
 		// TODO: this would be nicer as an ID-pointer...
-	RNA_def_string(ot->srna, "action", "", 21, "Action", "Name of Action to add as a new Action-Clip Strip.");
+	ot->prop = RNA_def_string(ot->srna, "action", "", 19, "Action", "Name of Action to add as a new Action-Clip Strip.");
 }
 
 /* ******************** Add Transition Operator ***************************** */
@@ -1672,7 +1673,7 @@
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 	
 	/* id-props */
-	RNA_def_enum(ot->srna, "type", fmodifier_type_items, 0, "Type", "");
+	ot->prop= RNA_def_enum(ot->srna, "type", fmodifier_type_items, 0, "Type", "");
 	RNA_def_boolean(ot->srna, "only_active", 0, "Only Active", "Only add F-Modifier of the specified type to the active strip.");
 }