rna/py-api fix.

C functions and python used different argument order, this relied on mapping non-keyword arguments to 'REQUIRED' arguments but meant that you could not have an optional, non-keyword argument.

next commit will make order of arguments consistant (currently only changed order that rna wrapped).
(commit 27674 and 27683 by Campbell from render25 branch)

1 files changed, 25 insertions, 25 deletions

diff --git a/source/blender/editors/space_nla/nla_buttons.c b/source/blender/editors/space_nla/nla_buttons.c
index 5ed7217bcbd..ceee7fc9971 100644
--- a/source/blender/editors/space_nla/nla_buttons.c
+++ b/source/blender/editors/space_nla/nla_buttons.c
@@ -241,15 +241,15 @@ static void nla_panel_animdata (const bContext *C, Panel *pa)
 	
 	/* extrapolation */
 	row= uiLayoutRow(layout, 1);
-		uiItemR(row, NULL, 0, &adt_ptr, "action_extrapolation", 0);
+		uiItemR(row, &adt_ptr, "action_extrapolation", 0, NULL, 0);
 	
 	/* blending */
 	row= uiLayoutRow(layout, 1);
-		uiItemR(row, NULL, 0, &adt_ptr, "action_blending", 0);	
+		uiItemR(row, &adt_ptr, "action_blending", 0, NULL, 0);	
 		
 	/* influence */
 	row= uiLayoutRow(layout, 1);
-		uiItemR(row, NULL, 0, &adt_ptr, "action_influence", 0);
+		uiItemR(row, &adt_ptr, "action_influence", 0, NULL, 0);
 }
 
 /* active NLA-Track */
@@ -269,7 +269,7 @@ static void nla_panel_track (const bContext *C, Panel *pa)
 	
 	/* Info - Active NLA-Context:Track ----------------------  */
 	row= uiLayoutRow(layout, 1);
-		uiItemR(row, NULL, ICON_NLA, &nlt_ptr, "name", 0);
+		uiItemR(row, &nlt_ptr, "name", 0, NULL, ICON_NLA);
 }
 
 /* generic settings for active NLA-Strip */
@@ -289,41 +289,41 @@ static void nla_panel_properties(const bContext *C, Panel *pa)
 	/* Strip Properties ------------------------------------- */
 	/* strip type */
 	row= uiLayoutColumn(layout, 1);
-		uiItemR(row, NULL, ICON_NLA, &strip_ptr, "name", 0); // XXX icon?
-		uiItemR(row, NULL, 0, &strip_ptr, "type", 0);
+		uiItemR(row, &strip_ptr, "name", 0, NULL, ICON_NLA); // XXX icon?
+		uiItemR(row, &strip_ptr, "type", 0, NULL, 0);
 	
 	/* strip extents */
 	column= uiLayoutColumn(layout, 1);
 		uiItemL(column, "Strip Extents:", 0);
-		uiItemR(column, NULL, 0, &strip_ptr, "start_frame", 0);
-		uiItemR(column, NULL, 0, &strip_ptr, "end_frame", 0);
+		uiItemR(column, &strip_ptr, "start_frame", 0, NULL, 0);
+		uiItemR(column, &strip_ptr, "end_frame", 0, NULL, 0);
 	
 	/* extrapolation */
 	row= uiLayoutRow(layout, 1);
-		uiItemR(row, NULL, 0, &strip_ptr, "extrapolation", 0);
+		uiItemR(row, &strip_ptr, "extrapolation", 0, NULL, 0);
 	
 	/* blending */
 	row= uiLayoutRow(layout, 1);
-		uiItemR(row, NULL, 0, &strip_ptr, "blending", 0);
+		uiItemR(row, &strip_ptr, "blending", 0, NULL, 0);
 		
 	/* blend in/out + autoblending
 	 *	- blend in/out can only be set when autoblending is off
 	 */
 	column= uiLayoutColumn(layout, 1);
 		uiLayoutSetActive(column, RNA_boolean_get(&strip_ptr, "animated_influence")==0); 
-		uiItemR(column, NULL, 0, &strip_ptr, "auto_blending", 0); // XXX as toggle?
+		uiItemR(column, &strip_ptr, "auto_blending", 0, NULL, 0); // XXX as toggle?
 		
 		subcol= uiLayoutColumn(column, 1);
 			uiLayoutSetActive(subcol, RNA_boolean_get(&strip_ptr, "auto_blending")==0); 
-			uiItemR(subcol, NULL, 0, &strip_ptr, "blend_in", 0);
-			uiItemR(subcol, NULL, 0, &strip_ptr, "blend_out", 0);
+			uiItemR(subcol, &strip_ptr, "blend_in", 0, NULL, 0);
+			uiItemR(subcol, &strip_ptr, "blend_out", 0, NULL, 0);
 		
 	/* settings */
 	column= uiLayoutColumn(layout, 1);
 		uiLayoutSetActive(column, !(RNA_boolean_get(&strip_ptr, "animated_influence") || RNA_boolean_get(&strip_ptr, "animated_time"))); 
 		uiItemL(column, "Playback Settings:", 0);
-		uiItemR(column, NULL, 0, &strip_ptr, "muted", 0);
-		uiItemR(column, NULL, 0, &strip_ptr, "reversed", 0);
+		uiItemR(column, &strip_ptr, "muted", 0, NULL, 0);
+		uiItemR(column, &strip_ptr, "reversed", 0, NULL, 0);
 }
 
 
@@ -345,22 +345,22 @@ static void nla_panel_actclip(const bContext *C, Panel *pa)
 	/* Strip Properties ------------------------------------- */
 	/* action pointer */
 	row= uiLayoutRow(layout, 1);
-		uiItemR(row, NULL, ICON_ACTION, &strip_ptr, "action", 0);
+		uiItemR(row, &strip_ptr, "action", 0, NULL, ICON_ACTION);
 		
 	/* action extents */
 	// XXX custom names were used here (to avoid the prefixes)... probably not necessary in future?
 	column= uiLayoutColumn(layout, 1);
 		uiItemL(column, "Action Extents:", 0);
-		uiItemR(column, "Start Frame", 0, &strip_ptr, "action_start_frame", 0);
-		uiItemR(column, "End Frame", 0, &strip_ptr, "action_end_frame", 0);
+		uiItemR(column, &strip_ptr, "action_start_frame", 0, "Start Frame", 0);
+		uiItemR(column, &strip_ptr, "action_end_frame", 0, "End Frame", 0);
 		uiItemO(column, NULL, 0, "NLA_OT_action_sync_length");
 		
 	/* action usage */
 	column= uiLayoutColumn(layout, 1);
 		uiLayoutSetActive(column, RNA_boolean_get(&strip_ptr, "animated_time")==0); 
 		uiItemL(column, "Playback Settings:", 0);
-		uiItemR(column, NULL, 0, &strip_ptr, "scale", 0);
-		uiItemR(column, NULL, 0, &strip_ptr, "repeat", 0);
+		uiItemR(column, &strip_ptr, "scale", 0, NULL, 0);
+		uiItemR(column, &strip_ptr, "repeat", 0, NULL, 0);
 }
 
 /* evaluation settings for active NLA-Strip */
@@ -379,22 +379,22 @@ static void nla_panel_evaluation(const bContext *C, Panel *pa)
 	uiBlockSetHandleFunc(block, do_nla_region_buttons, NULL);
 		
 	column= uiLayoutColumn(layout, 1);
-		uiItemR(column, NULL, 0, &strip_ptr, "animated_influence", 0);
+		uiItemR(column, &strip_ptr, "animated_influence", 0, NULL, 0);
 		
 		subcolumn= uiLayoutColumn(column, 1);
 		uiLayoutSetEnabled(subcolumn, RNA_boolean_get(&strip_ptr, "animated_influence"));	
-			uiItemR(subcolumn, NULL, 0, &strip_ptr, "influence", 0);
+			uiItemR(subcolumn, &strip_ptr, "influence", 0, NULL, 0);
 		
 	
 	column= uiLayoutColumn(layout, 1);
 		subrow= uiLayoutRow(column, 0);
-		uiItemR(subrow, NULL, 0, &strip_ptr, "animated_time", 0);
-		uiItemR(subrow, NULL, 0, &strip_ptr, "animated_time_cyclic", 0);
+		uiItemR(subrow, &strip_ptr, "animated_time", 0, NULL, 0);
+		uiItemR(subrow, &strip_ptr, "animated_time_cyclic", 0, NULL, 0);
 
 		subcolumn= uiLayoutColumn(column, 1);
 		subrow= uiLayoutRow(subcolumn, 0);
 		uiLayoutSetEnabled(subrow, RNA_boolean_get(&strip_ptr, "animated_time"));
-			uiItemR(subcolumn, NULL, 0, &strip_ptr, "strip_time", 0);
+			uiItemR(subcolumn, &strip_ptr, "strip_time", 0, NULL, 0);
 }
 
 /* F-Modifiers for active NLA-Strip */