[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22969] branches/blender2.5/blender: 2. 5 - A few bugfixes...

[Joshua Leung]

Revision: 22969
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22969
Author:   aligorith
Date:     2009-09-03 14:20:59 +0200 (Thu, 03 Sep 2009)

Log Message:
-----------
2.5 - A few bugfixes...

* Autoside renaming tools in EditMode for armatures now works again. (Wrong property name)
* Action used by NLA Strips can now be chosen/changed to another action

Modified Paths:
--------------
    branches/blender2.5/blender/release/ui/buttons_data_bone.py
    branches/blender2.5/blender/release/ui/space_view3d.py
    branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
    branches/blender2.5/blender/source/blender/editors/space_nla/nla_buttons.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_nla.c

Modified: branches/blender2.5/blender/release/ui/buttons_data_bone.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_data_bone.py	2009-09-03 10:42:53 UTC (rev 22968)
+++ branches/blender2.5/blender/release/ui/buttons_data_bone.py	2009-09-03 12:20:59 UTC (rev 22969)
@@ -80,6 +80,7 @@
 		
 		if not bone:
 			bone = context.edit_bone
+			pchan = None
 		else:
 			pchan = ob.pose.pose_channels[context.bone.name]
 

Modified: branches/blender2.5/blender/release/ui/space_view3d.py
===================================================================
--- branches/blender2.5/blender/release/ui/space_view3d.py	2009-09-03 10:42:53 UTC (rev 22968)
+++ branches/blender2.5/blender/release/ui/space_view3d.py	2009-09-03 12:20:59 UTC (rev 22969)
@@ -1069,9 +1069,9 @@
 		
 		layout.itemS()
 
-		layout.item_enumO("armature.autoside_names", "axis", 'XAXIS', text="AutoName Left/Right")
-		layout.item_enumO("armature.autoside_names", "axis", 'YAXIS', text="AutoName Front/Back")
-		layout.item_enumO("armature.autoside_names", "axis", 'ZAXIS', text="AutoName Top/Bottom")
+		layout.item_enumO("armature.autoside_names", "type", 'XAXIS', text="AutoName Left/Right")
+		layout.item_enumO("armature.autoside_names", "type", 'YAXIS', text="AutoName Front/Back")
+		layout.item_enumO("armature.autoside_names", "type", 'ZAXIS', text="AutoName Top/Bottom")
 		layout.itemO("armature.flip_names")
 
 		layout.itemS()

Modified: branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/armature/editarmature.c	2009-09-03 10:42:53 UTC (rev 22968)
+++ branches/blender2.5/blender/source/blender/editors/armature/editarmature.c	2009-09-03 12:20:59 UTC (rev 22969)
@@ -5387,7 +5387,7 @@
 	Object *ob= CTX_data_edit_object(C);
 	bArmature *arm;
 	char newname[32];
-	short axis= RNA_enum_get(op->ptr, "axis");
+	short axis= RNA_enum_get(op->ptr, "type");
 	
 	/* paranoia checks */
 	if (ELEM(NULL, ob, ob->pose)) 
@@ -5434,7 +5434,7 @@
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 	
 	/* settings */
-	RNA_def_enum(ot->srna, "axis", axis_items, 0, "Axis", "Axis tag names with.");
+	RNA_def_enum(ot->srna, "type", axis_items, 0, "Axis", "Axis tag names with.");
 }
 
 

Modified: branches/blender2.5/blender/source/blender/editors/space_nla/nla_buttons.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_nla/nla_buttons.c	2009-09-03 10:42:53 UTC (rev 22968)
+++ branches/blender2.5/blender/source/blender/editors/space_nla/nla_buttons.c	2009-09-03 12:20:59 UTC (rev 22969)
@@ -119,6 +119,7 @@
 	ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
 	
 	for (ale= anim_data.first; ale; ale= ale->next) {
+		// TODO: need some way to select active animdata too...
 		if (ale->type == ANIMTYPE_NLATRACK) {
 			NlaTrack *nlt= (NlaTrack *)ale->data;
 			AnimData *adt= ale->adt;
@@ -210,7 +211,7 @@
 	/* Active Action Properties ------------------------------------- */
 	/* action */
 	row= uiLayoutRow(layout, 1);
-		uiItemR(row, NULL, 0, &adt_ptr, "action", 0);
+		uiTemplateID(row, C, &adt_ptr, "action", NULL, NULL/*"ACT_OT_new", "ACT_OT_unlink"*/); // XXX: need to make these operators
 	
 	/* extrapolation */
 	row= uiLayoutRow(layout, 1);

Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_nla.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_nla.c	2009-09-03 10:42:53 UTC (rev 22968)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_nla.c	2009-09-03 12:20:59 UTC (rev 22969)
@@ -350,6 +350,7 @@
 	/* Action */
 	prop= RNA_def_property(srna, "action", PROP_POINTER, PROP_NONE);
 	RNA_def_property_pointer_sdna(prop, NULL, "act");
+	RNA_def_property_flag(prop, PROP_EDITABLE); 
 	RNA_def_property_ui_text(prop, "Action", "Action referenced by this strip.");
 	
 	/* Action extents */