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)

5 files changed, 47 insertions, 47 deletions

diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index ec6557e8730..63a3cf78eda 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -3717,7 +3717,7 @@ static uiBlock *menu_change_shortcut(bContext *C, ARegion *ar, void *arg)
 	
 	layout= uiBlockLayout(block, UI_LAYOUT_VERTICAL, UI_LAYOUT_PANEL, 0, 0, 200, 20, style);
 	
-	uiItemR(layout, "", 0, &ptr, "type", UI_ITEM_R_FULL_EVENT|UI_ITEM_R_IMMEDIATE);
+	uiItemR(layout, &ptr, "type", UI_ITEM_R_FULL_EVENT|UI_ITEM_R_IMMEDIATE, "", 0);
 	
 	uiPopupBoundsBlock(block, 6, 100, 10);
 	uiEndBlock(C, block);
@@ -3751,7 +3751,7 @@ static uiBlock *menu_add_shortcut(bContext *C, ARegion *ar, void *arg)
 	
 	layout= uiBlockLayout(block, UI_LAYOUT_VERTICAL, UI_LAYOUT_PANEL, 0, 0, 200, 20, style);
 
-	uiItemR(layout, "", 0, &ptr, "type", UI_ITEM_R_FULL_EVENT|UI_ITEM_R_IMMEDIATE);
+	uiItemR(layout, &ptr, "type", UI_ITEM_R_FULL_EVENT|UI_ITEM_R_IMMEDIATE, "", 0);
 	
 	uiPopupBoundsBlock(block, 6, 100, 10);
 	uiEndBlock(C, block);
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c
index aee1f543607..2ae1a549db9 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -884,7 +884,7 @@ static void ui_item_rna_size(uiLayout *layout, char *name, int icon, PointerRNA
 	*r_h= h;
 }
 
-void uiItemFullR(uiLayout *layout, char *name, int icon, PointerRNA *ptr, PropertyRNA *prop, int index, int value, int flag)
+void uiItemFullR(uiLayout *layout, PointerRNA *ptr, PropertyRNA *prop, int index, int value, int flag, char *name, int icon)
 {
 	uiBlock *block= layout->root->block;
 	uiBut *but;
@@ -967,7 +967,7 @@ void uiItemFullR(uiLayout *layout, char *name, int icon, PointerRNA *ptr, Proper
 		uiBlockSetEmboss(block, UI_EMBOSS);
 }
 
-void uiItemR(uiLayout *layout, char *name, int icon, PointerRNA *ptr, char *propname, int flag)
+void uiItemR(uiLayout *layout, PointerRNA *ptr, char *propname, int flag, char *name, int icon)
 {
 	PropertyRNA *prop= RNA_struct_find_property(ptr, propname);
 
@@ -977,7 +977,7 @@ void uiItemR(uiLayout *layout, char *name, int icon, PointerRNA *ptr, char *prop
 		return;
 	}
 
-	uiItemFullR(layout, name, icon, ptr, prop, RNA_NO_INDEX, 0, flag);
+	uiItemFullR(layout, ptr, prop, RNA_NO_INDEX, 0, flag, name, icon);
 }
 
 void uiItemEnumR(uiLayout *layout, char *name, int icon, struct PointerRNA *ptr, char *propname, int value)
@@ -990,7 +990,7 @@ void uiItemEnumR(uiLayout *layout, char *name, int icon, struct PointerRNA *ptr,
 		return;
 	}
 
-	uiItemFullR(layout, name, icon, ptr, prop, RNA_ENUM_VALUE, value, 0);
+	uiItemFullR(layout, ptr, prop, RNA_ENUM_VALUE, value, 0, name, icon);
 }
 
 void uiItemEnumR_string(uiLayout *layout, struct PointerRNA *ptr, char *propname, char *value, char *name, int icon)
@@ -1016,7 +1016,7 @@ void uiItemEnumR_string(uiLayout *layout, struct PointerRNA *ptr, char *propname
 
 	for(a=0; item[a].identifier; a++) {
 		if(item[a].value == ivalue) {
-			uiItemFullR(layout, (char*)item[a].name, item[a].icon, ptr, prop, RNA_ENUM_VALUE, ivalue, 0);
+			uiItemFullR(layout, ptr, prop, RNA_ENUM_VALUE, ivalue, 0, (char*)item[a].name, item[a].icon);
 			break;
 		}
 	}
diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c
index 0df19c564f7..5f517267805 100644
--- a/source/blender/editors/interface/interface_regions.c
+++ b/source/blender/editors/interface/interface_regions.c
@@ -1819,7 +1819,7 @@ static void uiBlockPicker(uiBlock *block, float *rgb, PointerRNA *ptr, PropertyR
 	uiButSetFunc(bt, do_picker_rna_cb, bt, NULL);
 	bt= uiDefButR(block, NUMSLI, 0, "B ",	0, -100, butwidth, UI_UNIT_Y, ptr, propname, 2, 0.0, 0.0, 0, 0, "");
 	uiButSetFunc(bt, do_picker_rna_cb, bt, NULL);
-	// could use uiItemFullR(col, "", 0, ptr, prop, -1, 0, UI_ITEM_R_EXPAND|UI_ITEM_R_SLIDER);
+	// could use uiItemFullR(col, ptr, prop, -1, 0, UI_ITEM_R_EXPAND|UI_ITEM_R_SLIDER, "", 0);
 	// but need to use uiButSetFunc for updating other fake buttons
 	
 	/* HSV values */
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index 5beb1dc7548..c3e691a0864 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -79,49 +79,49 @@ void uiTemplateDopeSheetFilter(uiLayout *layout, bContext *C, PointerRNA *ptr)
 	/* more 'generic' filtering options */
 	row= uiLayoutRow(layout, 1);
 	
-	uiItemR(row, "", 0, ptr, "only_selected", 0);
-	uiItemR(row, "", 0, ptr, "display_transforms", 0); // xxx: include in another position instead?
+	uiItemR(row, ptr, "only_selected", 0, "", 0);
+	uiItemR(row, ptr, "display_transforms", 0, "", 0); // xxx: include in another position instead?
 	
 	if (nlaActive)
-		uiItemR(row, "", 0, ptr, "include_missing_nla", 0);
+		uiItemR(row, ptr, "include_missing_nla", 0, "", 0);
 	
 	/* datatype based - only available datatypes are shown */
 	row= uiLayoutRow(layout, 1);
 
-	uiItemR(row, "", 0, ptr, "display_scene", 0);
-	uiItemR(row, "", 0, ptr, "display_world", 0);
-	uiItemR(row, "", 0, ptr, "display_node", 0);
+	uiItemR(row, ptr, "display_scene", 0, "", 0);
+	uiItemR(row, ptr, "display_world", 0, "", 0);
+	uiItemR(row, ptr, "display_node", 0, "", 0);
 	
 	if (mainptr && mainptr->mesh.first)
-		uiItemR(row, "", 0, ptr, "display_mesh", 0);
+		uiItemR(row, ptr, "display_mesh", 0, "", 0);
 	if (mainptr && mainptr->key.first)
-		uiItemR(row, "", 0, ptr, "display_shapekeys", 0);
+		uiItemR(row, ptr, "display_shapekeys", 0, "", 0);
 	if (mainptr && mainptr->mat.first)
-		uiItemR(row, "", 0, ptr, "display_material", 0);
+		uiItemR(row, ptr, "display_material", 0, "", 0);
 	if (mainptr && mainptr->lamp.first)
-		uiItemR(row, "", 0, ptr, "display_lamp", 0);
+		uiItemR(row, ptr, "display_lamp", 0, "", 0);
 	if (mainptr && mainptr->tex.first)
-		uiItemR(row, "", 0, ptr, "display_texture", 0);
+		uiItemR(row, ptr, "display_texture", 0, "", 0);
 	if (mainptr && mainptr->camera.first)
-		uiItemR(row, "", 0, ptr, "display_camera", 0);
+		uiItemR(row, ptr, "display_camera", 0, "", 0);
 	if (mainptr && mainptr->curve.first)
-		uiItemR(row, "", 0, ptr, "display_curve", 0);
+		uiItemR(row, ptr, "display_curve", 0, "", 0);
 	if (mainptr && mainptr->mball.first)
-		uiItemR(row, "", 0, ptr, "display_metaball", 0);
+		uiItemR(row, ptr, "display_metaball", 0, "", 0);
 	if (mainptr && mainptr->armature.first)
-		uiItemR(row, "", 0, ptr, "display_armature", 0);
+		uiItemR(row, ptr, "display_armature", 0, "", 0);
 	if (mainptr && mainptr->particle.first)
-		uiItemR(row, "", 0, ptr, "display_particle", 0);
+		uiItemR(row, ptr, "display_particle", 0, "", 0);
 	
 	/* group-based filtering (only when groups are available */
 	if (mainptr && mainptr->group.first) {
 		row= uiLayoutRow(layout, 1);
 		
-		uiItemR(row, "", 0, ptr, "only_group_objects", 0);
+		uiItemR(row, ptr, "only_group_objects", 0, "", 0);
 		
 		/* if enabled, show the group selection field too */
 		if (RNA_boolean_get(ptr, "only_group_objects"))
-			uiItemR(row, "", 0, ptr, "filtering_group", 0);
+			uiItemR(row, ptr, "filtering_group", 0, "", 0);
 	}
 }
 
@@ -562,10 +562,10 @@ void uiTemplateAnyID(uiLayout *layout, bContext *C, PointerRNA *ptr, char *propn
 	
 	/* ID-Type Selector - just have a menu of icons */
 	// FIXME: the icon-only setting doesn't work when we supply a blank name
-	uiItemFullR(row, "", 0, ptr, propType, 0, 0, UI_ITEM_R_ICON_ONLY);
+	uiItemFullR(row, ptr, propType, 0, 0, UI_ITEM_R_ICON_ONLY, "", 0);
 	
 	/* ID-Block Selector - just use pointer widget... */
-	uiItemFullR(row, "", 0, ptr, propID, 0, 0, 0);
+	uiItemFullR(row, ptr, propID, 0, 0, 0, "", 0);
 }
 
 /********************* RNA Path Builder Template ********************/
@@ -594,7 +594,7 @@ void uiTemplatePathBuilder(uiLayout *layout, bContext *C, PointerRNA *ptr, char
 	row= uiLayoutRow(layout, 1);
 	
 	/* Path (existing string) Widget */
-	uiItemR(row, text, ICON_RNA, ptr, propname, 0);
+	uiItemR(row, ptr, propname, 0, text, ICON_RNA);
 	
 	// TODO: attach something to this to make allow searching of nested properties to 'build' the path
 }
@@ -721,7 +721,7 @@ static uiLayout *draw_modifier(uiLayout *layout, Scene *scene, Object *ob, Modif
 		uiBlockSetEmboss(block, UI_EMBOSSN);
 		
 		/* Open/Close .................................  */
-		uiItemR(row, "", 0, &ptr, "expanded", 0);
+		uiItemR(row, &ptr, "expanded", 0, "", 0);
 		
 		/* modifier-type icon */
 		uiItemL(row, "", RNA_struct_ui_icon(ptr.type));
@@ -741,7 +741,7 @@ static uiLayout *draw_modifier(uiLayout *layout, Scene *scene, Object *ob, Modif
 		block = uiLayoutGetBlock(row);
 		
 		/* modifier name */
-		uiItemR(row, "", 0, &ptr, "name", 0);
+		uiItemR(row, &ptr, "name", 0, "", 0);
 		
 		if (compact) {
 			/* insert delete button at end of top row before splitting to second line */
@@ -763,11 +763,11 @@ static uiLayout *draw_modifier(uiLayout *layout, Scene *scene, Object *ob, Modif
 		if ( ((md->type!=eModifierType_Softbody && md->type!=eModifierType_Collision) || !(ob->pd && ob->pd->deflect)) 
 			&& (md->type!=eModifierType_Surface) ) 
 		{
-			uiItemR(row, "", 0, &ptr, "render", 0);
-			uiItemR(row, "", 0, &ptr, "realtime", 0);
+			uiItemR(row, &ptr, "render", 0, "", 0);
+			uiItemR(row, &ptr, "realtime", 0, "", 0);
 			
 			if (mti->flags & eModifierTypeFlag_SupportsEditmode)
-				uiItemR(row, "", 0, &ptr, "editmode", 0);
+				uiItemR(row, &ptr, "editmode", 0, "", 0);
 		}
 		if ((ob->type==OB_MESH) && modifier_couldBeCage(scene, md) && (index <= lastCageIndex)) 
 		{
@@ -1066,7 +1066,7 @@ static uiLayout *draw_constraint(uiLayout *layout, Object *ob, bConstraint *con)
 	rb_col= (con->flag & CONSTRAINT_ACTIVE)?50:20;
 	
 	/* open/close */
-	uiItemR(subrow, "", 0, &ptr, "expanded", UI_ITEM_R_ICON_ONLY);
+	uiItemR(subrow, &ptr, "expanded", UI_ITEM_R_ICON_ONLY, "", 0);
 	
 	/* name */	
 	uiBlockSetEmboss(block, UI_EMBOSS);
@@ -1077,7 +1077,7 @@ static uiLayout *draw_constraint(uiLayout *layout, Object *ob, bConstraint *con)
 	uiDefBut(block, LABEL, B_CONSTRAINT_TEST, typestr, xco+10, yco, 100, 18, NULL, 0.0, 0.0, 0.0, 0.0, ""); 
 	
 	if(proxy_protected == 0) {
-		uiItemR(subrow, "", 0, &ptr, "name", 0);
+		uiItemR(subrow, &ptr, "name", 0, "", 0);
 	}
 	else
 		uiItemL(subrow, con->name, 0);
@@ -1486,8 +1486,8 @@ static void colorband_buttons_large(uiLayout *layout, uiBlock *block, ColorBand
 		PointerRNA ptr;
 		RNA_pointer_create(cb->ptr.id.data, &RNA_ColorRampElement, cbd, &ptr);
 		row= uiLayoutRow(layout, 0);
-		uiItemR(row, "Pos", 0, &ptr, "position", 0);
-		uiItemR(row, "", 0, &ptr, "color", 0);
+		uiItemR(row, &ptr, "position", 0, "Pos", 0);
+		uiItemR(row, &ptr, "color", 0, "", 0);
 	}
 
 }
@@ -1509,7 +1509,7 @@ static void colorband_buttons_small(uiLayout *layout, uiBlock *block, ColorBand
 		CBData *cbd= coba->data + coba->cur;
 		PointerRNA ptr;
 		RNA_pointer_create(cb->ptr.id.data, &RNA_ColorRampElement, cbd, &ptr);
-		uiItemR(layout, "", 0, &ptr, "color", 0);
+		uiItemR(layout, &ptr, "color", 0, "", 0);
 	}
 
 	bt= uiDefButS(block, MENU, 0,		"Interpolation %t|Ease %x1|Cardinal %x3|Linear %x0|B-Spline %x2|Constant %x4",
@@ -1914,8 +1914,8 @@ static void curvemap_buttons_layout(uiLayout *layout, PointerRNA *ptr, char labe
 	/* black/white levels */
 	if(levels) {
 		split= uiLayoutSplit(layout, 0, 0);
-		uiItemR(uiLayoutColumn(split, 0), NULL, 0, ptr, "black_level", UI_ITEM_R_EXPAND);
-		uiItemR(uiLayoutColumn(split, 0), NULL, 0, ptr, "white_level", UI_ITEM_R_EXPAND);
+		uiItemR(uiLayoutColumn(split, 0), ptr, "black_level", UI_ITEM_R_EXPAND, NULL, 0);
+		uiItemR(uiLayoutColumn(split, 0), ptr, "white_level", UI_ITEM_R_EXPAND, NULL, 0);
 
 		uiLayoutRow(layout, 0);
 		bt=uiDefBut(block, BUT, 0, "Reset",	0, 0, UI_UNIT_X*10, UI_UNIT_Y, NULL, 0.0f, 0.0f, 0, 0, "Reset Black/White point and curves");
@@ -2004,9 +2004,9 @@ void uiTemplateTriColorSet(uiLayout *layout, PointerRNA *ptr, char *propname)
 	/* nselected, selected, active color swatches */
 	csPtr= RNA_property_pointer_get(ptr, prop);
 	
-	uiItemR(row, "", 0, &csPtr, "normal", 0);
-	uiItemR(row, "", 0, &csPtr, "selected", 0);
-	uiItemR(row, "", 0, &csPtr, "active", 0);
+	uiItemR(row, &csPtr, "normal", 0, "", 0);
+	uiItemR(row, &csPtr, "selected", 0, "", 0);
+	uiItemR(row, &csPtr, "active", 0, "", 0);
 }
 
 /********************* Layer Buttons Template ************************/
@@ -2197,11 +2197,11 @@ static void list_item_row(bContext *C, uiLayout *layout, PointerRNA *ptr, Pointe
 		uiBlockSetEmboss(block, UI_EMBOSSN);
 		row= uiLayoutRow(split, 1);
 		if(i == 0) uiItemL(row, "", 0);
-		else uiItemR(row, "", 0, itemptr, "value", 0);
+		else uiItemR(row, itemptr, "value", 0, "", 0);
 
 		if(ob->mode == OB_MODE_EDIT && !((ob->shapeflag & OB_SHAPE_EDIT_MODE) && ob->type == OB_MESH))
 			uiLayoutSetActive(row, 0);
-		//uiItemR(row, "", ICON_MUTE_IPO_OFF, itemptr, "mute", 0);
+		//uiItemR(row, itemptr, "mute", 0, "", ICON_MUTE_IPO_OFF);
 		uiBlockSetEmboss(block, UI_EMBOSS);
 	}
 	else
diff --git a/source/blender/editors/interface/interface_utils.c b/source/blender/editors/interface/interface_utils.c
index 87fdc2c6669..37278340275 100644
--- a/source/blender/editors/interface/interface_utils.c
+++ b/source/blender/editors/interface/interface_utils.c
@@ -157,7 +157,7 @@ void uiDefAutoButsRNA(const bContext *C, uiLayout *layout, PointerRNA *ptr, int
 		else
 			col= NULL;
 
-		uiItemFullR(col, "", 0, ptr, prop, -1, 0, 0);
+		uiItemFullR(col, ptr, prop, -1, 0, 0, "", 0);
 	}
 	RNA_STRUCT_END;
 }