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)

18 files changed, 375 insertions, 375 deletions

diff --git a/source/blender/editors/animation/fmodifier_ui.c b/source/blender/editors/animation/fmodifier_ui.c
index 5f800e0f6c2..c6ee9e4a960 100644
--- a/source/blender/editors/animation/fmodifier_ui.c
+++ b/source/blender/editors/animation/fmodifier_ui.c
@@ -225,14 +225,14 @@ static void draw_modifier__fn_generator(uiLayout *layout, ID *id, FModifier *fcm
 	
 	/* add the settings */
 	col= uiLayoutColumn(layout, 1);
-		uiItemR(col, "", 0, &ptr, "function_type", 0);
-		uiItemR(col, NULL, 0, &ptr, "additive", UI_ITEM_R_TOGGLE);
+		uiItemR(col, &ptr, "function_type", 0, "", 0);
+		uiItemR(col, &ptr, "additive", UI_ITEM_R_TOGGLE, NULL, 0);
 	
 	col= uiLayoutColumn(layout, 0); // no grouping for now
-		uiItemR(col, NULL, 0, &ptr, "amplitude", 0);
-		uiItemR(col, NULL, 0, &ptr, "phase_multiplier", 0);
-		uiItemR(col, NULL, 0, &ptr, "phase_offset", 0);
-		uiItemR(col, NULL, 0, &ptr, "value_offset", 0);
+		uiItemR(col, &ptr, "amplitude", 0, NULL, 0);
+		uiItemR(col, &ptr, "phase_multiplier", 0, NULL, 0);
+		uiItemR(col, &ptr, "phase_offset", 0, NULL, 0);
+		uiItemR(col, &ptr, "value_offset", 0, NULL, 0);
 }
 
 /* --------------- */
@@ -254,14 +254,14 @@ static void draw_modifier__cycles(uiLayout *layout, ID *id, FModifier *fcm, shor
 	/* before range */
 	col= uiLayoutColumn(split, 1);
 		uiItemL(col, "Before:", 0);
-		uiItemR(col, "", 0, &ptr, "before_mode", 0);
-		uiItemR(col, NULL, 0, &ptr, "before_cycles", 0);
+		uiItemR(col, &ptr, "before_mode", 0, "", 0);
+		uiItemR(col, &ptr, "before_cycles", 0, NULL, 0);
 		
 	/* after range */
 	col= uiLayoutColumn(split, 1);
 		uiItemL(col, "After:", 0);
-		uiItemR(col, "", 0, &ptr, "after_mode", 0);
-		uiItemR(col, NULL, 0, &ptr, "after_cycles", 0);
+		uiItemR(col, &ptr, "after_mode", 0, "", 0);
+		uiItemR(col, &ptr, "after_cycles", 0, NULL, 0);
 }
 
 /* --------------- */
@@ -276,20 +276,20 @@ static void draw_modifier__noise(uiLayout *layout, ID *id, FModifier *fcm, short
 	RNA_pointer_create(id, &RNA_FModifierNoise, fcm, &ptr);
 	
 	/* blending mode */
-	uiItemR(layout, NULL, 0, &ptr, "modification", 0);
+	uiItemR(layout, &ptr, "modification", 0, NULL, 0);
 	
 	/* split into 2 columns */
 	split= uiLayoutSplit(layout, 0.5f, 0);
 	
 	/* col 1 */
 	col= uiLayoutColumn(split, 0);
-		uiItemR(col, NULL, 0, &ptr, "size", 0);
-		uiItemR(col, NULL, 0, &ptr, "strength", 0);
+		uiItemR(col, &ptr, "size", 0, NULL, 0);
+		uiItemR(col, &ptr, "strength", 0, NULL, 0);
 	
 	/* col 2 */
 	col= uiLayoutColumn(split, 0);
-		uiItemR(col, NULL, 0, &ptr, "phase", 0);
-		uiItemR(col, NULL, 0, &ptr, "depth", 0);
+		uiItemR(col, &ptr, "phase", 0, NULL, 0);
+		uiItemR(col, &ptr, "depth", 0, NULL, 0);
 }
 
 /* --------------- */
@@ -470,11 +470,11 @@ static void draw_modifier__envelope(uiLayout *layout, ID *id, FModifier *fcm, sh
 	/* general settings */
 	col= uiLayoutColumn(layout, 1);
 		uiItemL(col, "Envelope:", 0);
-		uiItemR(col, NULL, 0, &ptr, "reference_value", 0);
+		uiItemR(col, &ptr, "reference_value", 0, NULL, 0);
 		
 		row= uiLayoutRow(col, 1);
-			uiItemR(row, "Min", 0, &ptr, "default_minimum", 0);
-			uiItemR(row, "Max", 0, &ptr, "default_maximum", 0);
+			uiItemR(row, &ptr, "default_minimum", 0, "Min", 0);
+			uiItemR(row, &ptr, "default_maximum", 0, "Max", 0);
 			
 	/* control points header */
 	// TODO: move this control-point control stuff to using the new special widgets for lists
@@ -526,13 +526,13 @@ static void draw_modifier__limits(uiLayout *layout, ID *id, FModifier *fcm, shor
 		
 		/* x-minimum */
 		col= uiLayoutColumn(split, 1);
-			uiItemR(col, NULL, 0, &ptr, "use_minimum_x", 0);
-			uiItemR(col, NULL, 0, &ptr, "minimum_x", 0);
+			uiItemR(col, &ptr, "use_minimum_x", 0, NULL, 0);
+			uiItemR(col, &ptr, "minimum_x", 0, NULL, 0);
 			
 		/* y-minimum*/
 		col= uiLayoutColumn(split, 1);
-			uiItemR(col, NULL, 0, &ptr, "use_minimum_y", 0);
-			uiItemR(col, NULL, 0, &ptr, "minimum_y", 0);
+			uiItemR(col, &ptr, "use_minimum_y", 0, NULL, 0);
+			uiItemR(col, &ptr, "minimum_y", 0, NULL, 0);
 	}
 	
 	/* row 2: maximum */
@@ -544,13 +544,13 @@ static void draw_modifier__limits(uiLayout *layout, ID *id, FModifier *fcm, shor
 		
 		/* x-minimum */
 		col= uiLayoutColumn(split, 1);
-			uiItemR(col, NULL, 0, &ptr, "use_maximum_x", 0);
-			uiItemR(col, NULL, 0, &ptr, "maximum_x", 0);
+			uiItemR(col, &ptr, "use_maximum_x", 0, NULL, 0);
+			uiItemR(col, &ptr, "maximum_x", 0, NULL, 0);
 			
 		/* y-minimum*/
 		col= uiLayoutColumn(split, 1);
-			uiItemR(col, NULL, 0, &ptr, "use_maximum_y", 0);
-			uiItemR(col, NULL, 0, &ptr, "maximum_y", 0);
+			uiItemR(col, &ptr, "use_maximum_y", 0, NULL, 0);
+			uiItemR(col, &ptr, "maximum_y", 0, NULL, 0);
 	}
 }
 
@@ -567,24 +567,24 @@ static void draw_modifier__stepped(uiLayout *layout, ID *id, FModifier *fcm, sho
 	
 	/* block 1: "stepping" settings */
 	col= uiLayoutColumn(layout, 0);
-		uiItemR(col, NULL, 0, &ptr, "step_size", 0);
-		uiItemR(col, NULL, 0, &ptr, "offset", 0);
+		uiItemR(col, &ptr, "step_size", 0, NULL, 0);
+		uiItemR(col, &ptr, "offset", 0, NULL, 0);
 		
 	/* block 2: start range settings */
 	col= uiLayoutColumn(layout, 1);
-		uiItemR(col, NULL, 0, &ptr, "use_start_frame", 0);
+		uiItemR(col, &ptr, "use_start_frame", 0, NULL, 0);
 		
 		subcol = uiLayoutColumn(col, 1);
 		uiLayoutSetActive(subcol, RNA_boolean_get(&ptr, "use_start_frame"));
-			uiItemR(subcol, NULL, 0, &ptr, "start_frame", 0);
+			uiItemR(subcol, &ptr, "start_frame", 0, NULL, 0);
 			
 	/* block 3: end range settings */
 	col= uiLayoutColumn(layout, 1);
-		uiItemR(col, NULL, 0, &ptr, "use_end_frame", 0);
+		uiItemR(col, &ptr, "use_end_frame", 0, NULL, 0);
 		
 		subcol = uiLayoutColumn(col, 1);
 		uiLayoutSetActive(subcol, RNA_boolean_get(&ptr, "use_end_frame"));
-			uiItemR(subcol, NULL, 0, &ptr, "end_frame", 0);
+			uiItemR(subcol, &ptr, "end_frame", 0, NULL, 0);
 }
 
 /* --------------- */
@@ -616,10 +616,10 @@ void ANIM_uiTemplate_fmodifier_draw (uiLayout *layout, ID *id, ListBase *modifie
 		uiBlockSetEmboss(block, UI_EMBOSSN);
 		
 		/* expand */
-		uiItemR(subrow, "", 0, &ptr, "expanded", UI_ITEM_R_ICON_ONLY);
+		uiItemR(subrow, &ptr, "expanded", UI_ITEM_R_ICON_ONLY, "", 0);
 		
 		/* checkbox for 'active' status (for now) */
-		uiItemR(subrow, "", 0, &ptr, "active", UI_ITEM_R_ICON_ONLY);
+		uiItemR(subrow, &ptr, "active", UI_ITEM_R_ICON_ONLY, "", 0);
 		
 		/* name */
 		if (fmi)
@@ -633,7 +633,7 @@ void ANIM_uiTemplate_fmodifier_draw (uiLayout *layout, ID *id, ListBase *modifie
 		
 		
 		/* 'mute' button */
-		uiItemR(subrow, "", 0, &ptr, "muted", UI_ITEM_R_ICON_ONLY);
+		uiItemR(subrow, &ptr, "muted", UI_ITEM_R_ICON_ONLY, "", 0);
 		
 		uiBlockSetEmboss(block, UI_EMBOSSN);
 		
diff --git a/source/blender/editors/gpencil/gpencil_buttons.c b/source/blender/editors/gpencil/gpencil_buttons.c
index 58559029bef..cc4a05c3421 100644
--- a/source/blender/editors/gpencil/gpencil_buttons.c
+++ b/source/blender/editors/gpencil/gpencil_buttons.c
@@ -122,11 +122,11 @@ static void gp_drawui_layer (uiLayout *layout, bGPdata *gpd, bGPDlayer *gpl)
 	
 	/* active */
 	icon= (gpl->flag & GP_LAYER_ACTIVE) ? ICON_RADIOBUT_ON : ICON_RADIOBUT_OFF;
-	uiItemR(subrow, "", icon, &ptr, "active", 0);
+	uiItemR(subrow, &ptr, "active", 0, "", icon);
 	
 	/* locked */
 	icon= (gpl->flag & GP_LAYER_LOCKED) ? ICON_LOCKED : ICON_UNLOCKED;
-	uiItemR(subrow, "", icon, &ptr, "locked", 0);
+	uiItemR(subrow, &ptr, "locked", 0, "", icon);
 	
 	/* when layer is locked or hidden, only draw header */
 	if (gpl->flag & (GP_LAYER_LOCKED|GP_LAYER_HIDE)) {
@@ -134,7 +134,7 @@ static void gp_drawui_layer (uiLayout *layout, bGPdata *gpd, bGPDlayer *gpl)
 		
 		/* visibility button (only if hidden but not locked!) */
 		if ((gpl->flag & GP_LAYER_HIDE) && !(gpl->flag & GP_LAYER_LOCKED))
-			uiItemR(subrow, "", ICON_RESTRICT_VIEW_ON, &ptr, "hide", 0); 
+			uiItemR(subrow, &ptr, "hide", 0, "", ICON_RESTRICT_VIEW_ON); 
 			
 		
 		/* name */
@@ -159,17 +159,17 @@ static void gp_drawui_layer (uiLayout *layout, bGPdata *gpd, bGPDlayer *gpl)
 	else {
 		/* draw rest of header -------------------------------- */
 		/* visibility button */
-		uiItemR(subrow, "", ICON_RESTRICT_VIEW_OFF, &ptr, "hide", 0); 
+		uiItemR(subrow, &ptr, "hide", 0, "", ICON_RESTRICT_VIEW_OFF); 
 		
 		/* frame locking */
 		// TODO: this needs its own icons...
 		icon= (gpl->flag & GP_LAYER_FRAMELOCK) ? ICON_RENDER_STILL : ICON_RENDER_ANIMATION;
-		uiItemR(subrow, "", icon, &ptr, "frame_lock", 0); 
+		uiItemR(subrow, &ptr, "frame_lock", 0, "", icon); 
 		
 		uiBlockSetEmboss(block, UI_EMBOSS);
 		
 		/* name */
-		uiItemR(subrow, "", 0, &ptr, "info", 0);
+		uiItemR(subrow, &ptr, "info", 0, "", 0);
 		
 		/* delete 'button' */
 		uiBlockSetEmboss(block, UI_EMBOSSN);
@@ -193,17 +193,17 @@ static void gp_drawui_layer (uiLayout *layout, bGPdata *gpd, bGPDlayer *gpl)
 		
 		/* color */
 		subcol= uiLayoutColumn(col, 1);
-			uiItemR(subcol, "", 0, &ptr, "color", 0);
-			uiItemR(subcol, NULL, 0, &ptr, "opacity", UI_ITEM_R_SLIDER);
+			uiItemR(subcol, &ptr, "color", 0, "", 0);
+			uiItemR(subcol, &ptr, "opacity", UI_ITEM_R_SLIDER, NULL, 0);
 			
 		/* stroke thickness */
 		subcol= uiLayoutColumn(col, 1);
-			uiItemR(subcol, NULL, 0, &ptr, "line_thickness", UI_ITEM_R_SLIDER);
+			uiItemR(subcol, &ptr, "line_thickness", UI_ITEM_R_SLIDER, NULL, 0);
 		
 		/* debugging options */
 		if (G.f & G_DEBUG) {
 			subcol= uiLayoutColumn(col, 1);
-				uiItemR(subcol, NULL, 0, &ptr, "show_points", 0);
+				uiItemR(subcol, &ptr, "show_points", 0, NULL, 0);
 		}
 		
 		/* right column ................... */
@@ -211,8 +211,8 @@ static void gp_drawui_layer (uiLayout *layout, bGPdata *gpd, bGPDlayer *gpl)
 		
 		/* onion-skinning */
 		subcol= uiLayoutColumn(col, 1);
-			uiItemR(subcol, "Onion Skinning", 0, &ptr, "use_onion_skinning", 0);
-			uiItemR(subcol, "Frames", 0, &ptr, "max_ghost_range", 0); // XXX shorter name here? (i.e. GStep)
+			uiItemR(subcol, &ptr, "use_onion_skinning", 0, "Onion Skinning", 0);
+			uiItemR(subcol, &ptr, "max_ghost_range", 0, "Frames", 0); // XXX shorter name here? i.e. GStep
 		
 		/* additional options... */
 		subcol= uiLayoutColumn(col, 1);
@@ -265,7 +265,7 @@ static void draw_gpencil_panel (bContext *C, uiLayout *layout, bGPdata *gpd, Poi
 		
 		row= uiLayoutRow(col, 0);
 		uiLayoutSetActive(row, (gpd->flag & (GP_DATA_DEPTH_STROKE|GP_DATA_DEPTH_VIEW)) ? 1:0);
-		uiItemR(row, NULL, 0, &gpd_ptr, "use_stroke_endpoints", 0);
+		uiItemR(row, &gpd_ptr, "use_stroke_endpoints", 0, NULL, 0);
 }	
 
 
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h
index fea9e1368c2..dfc89ea16df 100644
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -702,8 +702,8 @@ void uiItemFloatO(uiLayout *layout, char *name, int icon, char *opname, char *pr
 void uiItemStringO(uiLayout *layout, char *name, int icon, char *opname, char *propname, char *value);
 PointerRNA uiItemFullO(uiLayout *layout, char *idname, char *name, int icon, struct IDProperty *properties, int context, int flag);
 
-void uiItemR(uiLayout *layout, char *name, int icon, struct PointerRNA *ptr, char *propname, int flag);
-void uiItemFullR(uiLayout *layout, char *name, int icon, struct PointerRNA *ptr, struct PropertyRNA *prop, int index, int value, int flag);
+void uiItemR(uiLayout *layout, struct PointerRNA *ptr, char *propname, int flag, char *name, int icon);
+void uiItemFullR(uiLayout *layout, struct PointerRNA *ptr, struct PropertyRNA *prop, int index, int value, int flag, char *name, int icon);
 void uiItemEnumR(uiLayout *layout, char *name, int icon, struct PointerRNA *ptr, char *propname, int value);
 void uiItemEnumR_string(uiLayout *layout, struct PointerRNA *ptr, char *propname, char *value, char *name, int icon);
 void uiItemsEnumR(uiLayout *layout, struct PointerRNA *ptr, char *propname);
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;
 }
diff --git a/source/blender/editors/space_file/file_panels.c b/source/blender/editors/space_file/file_panels.c
index b9622d64ee4..637e56459d7 100644
--- a/source/blender/editors/space_file/file_panels.c
+++ b/source/blender/editors/space_file/file_panels.c
@@ -189,7 +189,7 @@ static void file_panel_operator(const bContext *C, Panel *pa)
 			if(strcmp(RNA_property_identifier(prop), "filename") == 0)
 				continue;
 
-			uiItemFullR(pa->layout, NULL, 0, op->ptr, prop, -1, 0, 0);
+			uiItemFullR(pa->layout, op->ptr, prop, -1, 0, 0, NULL, 0);
 			empty= 0;
 		}
 		RNA_STRUCT_END;
diff --git a/source/blender/editors/space_graph/graph_buttons.c b/source/blender/editors/space_graph/graph_buttons.c
index c7b98973bba..ac3b91e275c 100644
--- a/source/blender/editors/space_graph/graph_buttons.c
+++ b/source/blender/editors/space_graph/graph_buttons.c
@@ -147,7 +147,7 @@ static void graph_panel_view(const bContext *C, Panel *pa)
 
 	/* 2D-Cursor */
 	col= uiLayoutColumn(pa->layout, 0);
-		uiItemR(col, NULL, 0, &spaceptr, "show_cursor", 0);
+		uiItemR(col, &spaceptr, "show_cursor", 0, NULL, 0);
 		
 		subcol= uiLayoutColumn(col, 1);
 		uiLayoutSetActive(subcol, RNA_boolean_get(&spaceptr, "show_cursor")); 
@@ -156,10 +156,10 @@ static void graph_panel_view(const bContext *C, Panel *pa)
 		subcol= uiLayoutColumn(col, 1);
 		uiLayoutSetActive(subcol, RNA_boolean_get(&spaceptr, "show_cursor")); 
 			row= uiLayoutSplit(subcol, 0.7, 1);
-				uiItemR(row, "Cursor X", 0, &sceneptr, "current_frame", 0);
+				uiItemR(row, &sceneptr, "current_frame", 0, "Cursor X", 0);
 				uiItemEnumO(row, "GRAPH_OT_snap", "To Keys", 0, "type", GRAPHKEYS_SNAP_CFRA);
 			row= uiLayoutSplit(subcol, 0.7, 1);
-				uiItemR(row, "Cursor Y", 0, &spaceptr, "cursor_value", 0);
+				uiItemR(row, &spaceptr, "cursor_value", 0, "Cursor Y", 0);
 				uiItemEnumO(row, "GRAPH_OT_snap", "To Keys", 0, "type", GRAPHKEYS_SNAP_VALUE);
 }
 
@@ -194,19 +194,19 @@ static void graph_panel_properties(const bContext *C, Panel *pa)
 	/* RNA-Path Editing - only really should be enabled when things aren't working */
 	col= uiLayoutColumn(layout, 1);
 		uiLayoutSetEnabled(col, (fcu->flag & FCURVE_DISABLED)); 
-		uiItemR(col, "", ICON_RNA, &fcu_ptr, "data_path", 0);
-		uiItemR(col, NULL, 0, &fcu_ptr, "array_index", 0);
+		uiItemR(col, &fcu_ptr, "data_path", 0, "", ICON_RNA);
+		uiItemR(col, &fcu_ptr, "array_index", 0, NULL, 0);
 		
 	/* color settings */
 	col= uiLayoutColumn(layout, 1);
 		uiItemL(col, "Display Color:", 0);
 		
 		row= uiLayoutRow(col, 1);
-			uiItemR(row, "", 0, &fcu_ptr, "color_mode", 0);
+			uiItemR(row, &fcu_ptr, "color_mode", 0, "", 0);
 			
 			subrow= uiLayoutRow(row, 1);
 				uiLayoutSetEnabled(subrow, (fcu->color_mode==FCURVE_COLOR_CUSTOM));
-				uiItemR(subrow, "", 0, &fcu_ptr, "color", 0);
+				uiItemR(subrow, &fcu_ptr, "color", 0, "", 0);
 	
 	/* TODO: the following settings could be added here
 	 *	- Access details (ID-block + RNA-Path + Array Index)
@@ -388,7 +388,7 @@ static void graph_panel_driverVar__locDiff(const bContext *C, uiLayout *layout,
 			uiItemPointerR(col, &dtar_ptr, "bone_target", &tar_ptr, "bones", "", ICON_BONE_DATA);
 		}
 		
-		uiItemR(col, NULL, 0, &dtar_ptr, "use_local_space_transforms", 0);
+		uiItemR(col, &dtar_ptr, "use_local_space_transforms", 0, NULL, 0);
 	
 	col= uiLayoutColumn(layout, 1);
 		uiTemplateAnyID(col, (bContext *)C, &dtar2_ptr, "id", "id_type", "Ob/Bone 2:");
@@ -400,7 +400,7 @@ static void graph_panel_driverVar__locDiff(const bContext *C, uiLayout *layout,
 			uiItemPointerR(col, &dtar2_ptr, "bone_target", &tar_ptr, "bones", "", ICON_BONE_DATA);
 		}
 		
-		uiItemR(col, NULL, 0, &dtar2_ptr, "use_local_space_transforms", 0);
+		uiItemR(col, &dtar2_ptr, "use_local_space_transforms", 0, NULL, 0);
 }
 
 /* settings for 'transform channel' driver variable type */
@@ -426,8 +426,8 @@ static void graph_panel_driverVar__transChan(const bContext *C, uiLayout *layout
 		}
 		
 		row= uiLayoutRow(layout, 1);
-			uiItemR(row, "", 0, &dtar_ptr, "transform_type", 0);
-			uiItemR(row, NULL, 0, &dtar_ptr, "use_local_space_transforms", 0);
+			uiItemR(row, &dtar_ptr, "transform_type", 0, "", 0);
+			uiItemR(row, &dtar_ptr, "use_local_space_transforms", 0, NULL, 0);
 }
 
 /* driver settings for active F-Curve (only for 'Drivers' mode) */
@@ -466,12 +466,12 @@ static void graph_panel_drivers(const bContext *C, Panel *pa)
 	
 	col= uiLayoutColumn(pa->layout, 1);
 	block= uiLayoutGetBlock(col);
-		uiItemR(col, NULL, 0, &driver_ptr, "type", 0);
+		uiItemR(col, &driver_ptr, "type", 0, NULL, 0);
 		
 		/* show expression box if doing scripted drivers, and/or error messages when invalid drivers exist */
 		if (driver->type == DRIVER_TYPE_PYTHON) {
 			/* expression */
-			uiItemR(col, "Expr", 0, &driver_ptr, "expression", 0);
+			uiItemR(col, &driver_ptr, "expression", 0, "Expr", 0);
 			
 			/* errors? */
 			if (driver->flag & DRIVER_FLAG_INVALID)
@@ -485,7 +485,7 @@ static void graph_panel_drivers(const bContext *C, Panel *pa)
 		
 	col= uiLayoutColumn(pa->layout, 1);
 		/* debug setting */
-		uiItemR(col, NULL, 0, &driver_ptr, "show_debug_info", 0);
+		uiItemR(col, &driver_ptr, "show_debug_info", 0, NULL, 0);
 		
 		/* value of driver */
 		if (driver->flag & DRIVER_FLAG_SHOWDEBUG) {
@@ -520,7 +520,7 @@ static void graph_panel_drivers(const bContext *C, Panel *pa)
 			row= uiLayoutRow(box, 0);
 			block= uiLayoutGetBlock(row);
 				/* variable name */
-				uiItemR(row, "", 0, &dvar_ptr, "name", 0);
+				uiItemR(row, &dvar_ptr, "name", 0, "", 0);
 				
 				/* remove button */
 				uiBlockSetEmboss(block, UI_EMBOSSN);
@@ -530,7 +530,7 @@ static void graph_panel_drivers(const bContext *C, Panel *pa)
 			
 			/* variable type */
 			row= uiLayoutRow(box, 0);
-				uiItemR(row, "", 0, &dvar_ptr, "type", 0);
+				uiItemR(row, &dvar_ptr, "type", 0, "", 0);
 				
 		/* variable type settings */
 		box= uiLayoutBox(col);
diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c
index 6f96de1bae0..5f96c4a2324 100644
--- a/source/blender/editors/space_image/image_buttons.c
+++ b/source/blender/editors/space_image/image_buttons.c
@@ -883,11 +883,11 @@ void uiTemplateImage(uiLayout *layout, bContext *C, PointerRNA *ptr, char *propn
 		}
 		else {
 			row= uiLayoutRow(layout, 0);
-			uiItemR(row, NULL, 0, &imaptr, "source", (compact)? 0: UI_ITEM_R_EXPAND);
+			uiItemR(row, &imaptr, "source", (compact)? 0: UI_ITEM_R_EXPAND, NULL, 0);
 
 			if(ima->source != IMA_SRC_GENERATED) {
 				row= uiLayoutRow(layout, 1);
-				uiItemR(row, "", 0, &imaptr, "filename", 0);
+				uiItemR(row, &imaptr, "filename", 0, "", 0);
 				uiItemO(row, "", ICON_FILE_REFRESH, "image.reload");
 			}
 
@@ -922,14 +922,14 @@ void uiTemplateImage(uiLayout *layout, bContext *C, PointerRNA *ptr, char *propn
 					split= uiLayoutSplit(layout, 0, 0);
 
 					col= uiLayoutColumn(split, 0);
-					uiItemR(col, NULL, 0, &imaptr, "fields", 0);
+					uiItemR(col, &imaptr, "fields", 0, NULL, 0);
 					row= uiLayoutRow(col, 0);
-					uiItemR(row, NULL, 0, &imaptr, "field_order", UI_ITEM_R_EXPAND);
+					uiItemR(row, &imaptr, "field_order", UI_ITEM_R_EXPAND, NULL, 0);
 					uiLayoutSetActive(row, RNA_boolean_get(&imaptr, "fields"));
 
 					col= uiLayoutColumn(split, 0);
-					uiItemR(col, NULL, 0, &imaptr, "antialias", 0);
-					uiItemR(col, NULL, 0, &imaptr, "premultiply", 0);
+					uiItemR(col, &imaptr, "antialias", 0, NULL, 0);
+					uiItemR(col, &imaptr, "premultiply", 0, NULL, 0);
 				}
 			}
 
@@ -942,30 +942,30 @@ void uiTemplateImage(uiLayout *layout, bContext *C, PointerRNA *ptr, char *propn
 				 
 				sprintf(str, "(%d) Frames", iuser->framenr);
 				row= uiLayoutRow(col, 1);
-				uiItemR(col, str, 0, userptr, "frames", 0);
+				uiItemR(col, userptr, "frames", 0, str, 0);
 				if(ima->anim) {
 					block= uiLayoutGetBlock(row);
 					but= uiDefBut(block, BUT, 0, "<", 0, 0, UI_UNIT_X*2, UI_UNIT_Y, 0, 0, 0, 0, 0, "Set the number of frames from the movie or sequence.");
 					uiButSetFunc(but, set_frames_cb, ima, iuser);
 				}
 
-				uiItemR(col, "Start", 0, userptr, "start_frame", 0);
-				uiItemR(col, NULL, 0, userptr, "offset", 0);
+				uiItemR(col, userptr, "start_frame", 0, "Start", 0);
+				uiItemR(col, userptr, "offset", 0, NULL, 0);
 
 				col= uiLayoutColumn(split, 0);
-				uiItemR(col, "Fields", 0, userptr, "fields_per_frame", 0);
-				uiItemR(col, NULL, 0, userptr, "auto_refresh", 0);
-				uiItemR(col, NULL, 0, userptr, "cyclic", 0);
+				uiItemR(col, userptr, "fields_per_frame", 0, "Fields", 0);
+				uiItemR(col, userptr, "auto_refresh", 0, NULL, 0);
+				uiItemR(col, userptr, "cyclic", 0, NULL, 0);
 			}
 			else if(ima->source==IMA_SRC_GENERATED) {
 				split= uiLayoutSplit(layout, 0, 0);
 
 				col= uiLayoutColumn(split, 1);
-				uiItemR(col, "X", 0, &imaptr, "generated_width", 0);
-				uiItemR(col, "Y", 0, &imaptr, "generated_height", 0);
+				uiItemR(col, &imaptr, "generated_width", 0, "X", 0);
+				uiItemR(col, &imaptr, "generated_height", 0, "Y", 0);
 
 				col= uiLayoutColumn(split, 0);
-				uiItemR(col, NULL, 0, &imaptr, "generated_type", UI_ITEM_R_EXPAND);
+				uiItemR(col, &imaptr, "generated_type", UI_ITEM_R_EXPAND, NULL, 0);
 			}
 
 					}
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 */
diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c
index 75328bfdc7a..3a91b5c7210 100644
--- a/source/blender/editors/space_node/drawnode.c
+++ b/source/blender/editors/space_node/drawnode.c
@@ -93,7 +93,7 @@ static void node_buts_value(uiLayout *layout, bContext *C, PointerRNA *ptr)
 	prop = RNA_struct_find_property(ptr, "outputs");
 	RNA_property_collection_lookup_int(ptr, prop, 0, &sockptr);
 	
-	uiItemR(layout, "", 0, &sockptr, "default_value", 0);
+	uiItemR(layout, &sockptr, "default_value", 0, "", 0);
 }
 
 static void node_buts_rgb(uiLayout *layout, bContext *C, PointerRNA *ptr)
@@ -108,7 +108,7 @@ static void node_buts_rgb(uiLayout *layout, bContext *C, PointerRNA *ptr)
 	
 	col = uiLayoutColumn(layout, 0);
 	uiTemplateColorWheel(col, &sockptr, "default_value", 1, 0);
-	uiItemR(col, "", 0, &sockptr, "default_value", 0);
+	uiItemR(col, &sockptr, "default_value", 0, "", 0);
 }
 
 static void node_buts_mix_rgb(uiLayout *layout, bContext *C, PointerRNA *ptr)
@@ -118,9 +118,9 @@ static void node_buts_mix_rgb(uiLayout *layout, bContext *C, PointerRNA *ptr)
 	bNodeTree *ntree= (bNodeTree*)ptr->id.data;
 
 	row= uiLayoutRow(layout, 1);
-	uiItemR(row, "", 0, ptr, "blend_type", 0);
+	uiItemR(row, ptr, "blend_type", 0, "", 0);
 	if(ntree->type == NTREE_COMPOSIT)
-		uiItemR(row, "", ICON_IMAGE_RGB_ALPHA, ptr, "alpha", 0);
+		uiItemR(row, ptr, "alpha", 0, "", ICON_IMAGE_RGB_ALPHA);
 }
 
 static void node_buts_time(uiLayout *layout, bContext *C, PointerRNA *ptr)
@@ -141,8 +141,8 @@ static void node_buts_time(uiLayout *layout, bContext *C, PointerRNA *ptr)
 	uiTemplateCurveMapping(layout, ptr, "curve", 's', 0, 0);
 
 	row= uiLayoutRow(layout, 1);
-	uiItemR(row, "Sta", 0, ptr, "start", 0);
-	uiItemR(row, "End", 0, ptr, "end", 0);
+	uiItemR(row, ptr, "start", 0, "Sta", 0);
+	uiItemR(row, ptr, "end", 0, "End", 0);
 }
 
 static void node_buts_colorramp(uiLayout *layout, bContext *C, PointerRNA *ptr)
@@ -260,17 +260,17 @@ static void node_buts_texture(uiLayout *layout, bContext *C, PointerRNA *ptr)
 		(node->type != TEX_NODE_TEXTURE)
 	);
 	
-	uiItemR(layout, "", 0, ptr, "texture", 0);
+	uiItemR(layout, ptr, "texture", 0, "", 0);
 	
 	if(multi) {
 		/* Number Drawing not optimal here, better have a list*/
-		uiItemR(layout, "", 0, ptr, "node_output", 0);
+		uiItemR(layout, ptr, "node_output", 0, "", 0);
 	}
 }
 
 static void node_buts_math(uiLayout *layout, bContext *C, PointerRNA *ptr)
 { 
-	uiItemR(layout, "", 0, ptr, "operation", 0);
+	uiItemR(layout, ptr, "operation", 0, "", 0);
 }
 
 /* ****************** BUTTON CALLBACKS FOR SHADER NODES ***************** */
@@ -311,9 +311,9 @@ static void node_shader_buts_material(uiLayout *layout, bContext *C, PointerRNA
 	if(!node->id) return;
 	
 	col= uiLayoutColumn(layout, 0);
-	uiItemR(col, NULL, 0, ptr, "diffuse", 0);
-	uiItemR(col, NULL, 0, ptr, "specular", 0);
-	uiItemR(col, NULL, 0, ptr, "invert_normal", 0);
+	uiItemR(col, ptr, "diffuse", 0, NULL, 0);
+	uiItemR(col, ptr, "specular", 0, NULL, 0);
+	uiItemR(col, ptr, "invert_normal", 0, NULL, 0);
 }
 
 static void node_shader_buts_mapping(uiLayout *layout, bContext *C, PointerRNA *ptr)
@@ -322,29 +322,29 @@ static void node_shader_buts_mapping(uiLayout *layout, bContext *C, PointerRNA *
 	
 	uiItemL(layout, "Location:", 0);
 	row= uiLayoutRow(layout, 1);
-	uiItemR(row, "", 0, ptr, "location", 0);
+	uiItemR(row, ptr, "location", 0, "", 0);
 	
 	uiItemL(layout, "Rotation:", 0);
 	row= uiLayoutRow(layout, 1);
-	uiItemR(row, "", 0, ptr, "rotation", 0);
+	uiItemR(row, ptr, "rotation", 0, "", 0);
 	
 	uiItemL(layout, "Scale:", 0);
 	row= uiLayoutRow(layout, 1);
-	uiItemR(row, "", 0, ptr, "scale", 0);
+	uiItemR(row, ptr, "scale", 0, "", 0);
 	
 	row= uiLayoutRow(layout, 1);
-	uiItemR(row, "Min", 0, ptr, "clamp_minimum", 0);
-	uiItemR(row, "", 0, ptr, "minimum", 0);
+	uiItemR(row, ptr, "clamp_minimum", 0, "Min", 0);
+	uiItemR(row, ptr, "minimum", 0, "", 0);
 	
 	row= uiLayoutRow(layout, 1);
-	uiItemR(row, "Max", 0, ptr, "clamp_maximum", 0);
-	uiItemR(row, "", 0, ptr, "maximum", 0);
+	uiItemR(row, ptr, "clamp_maximum", 0, "Max", 0);
+	uiItemR(row, ptr, "maximum", 0, "", 0);
 	
 }
 
 static void node_shader_buts_vect_math(uiLayout *layout, bContext *C, PointerRNA *ptr)
 { 
-	uiItemR(layout, "", 0, ptr, "operation", 0);
+	uiItemR(layout, ptr, "operation", 0, "", 0);
 }
 
 static void node_shader_buts_geometry(uiLayout *layout, bContext *C, PointerRNA *ptr)
@@ -352,8 +352,8 @@ static void node_shader_buts_geometry(uiLayout *layout, bContext *C, PointerRNA
 	uiLayout *col;
 	
 	col= uiLayoutColumn(layout, 0);
-	uiItemR(col, "UV", 0, ptr, "uv_layer", 0);
-	uiItemR(col, "VCol", 0, ptr, "color_layer", 0);
+	uiItemR(col, ptr, "uv_layer", 0, "UV", 0);
+	uiItemR(col, ptr, "color_layer", 0, "VCol", 0);
 }
 
 static void node_shader_buts_dynamic(uiLayout *layout, bContext *C, PointerRNA *ptr)
@@ -467,21 +467,21 @@ static void node_composit_buts_image(uiLayout *layout, bContext *C, PointerRNA *
 	
 	col= uiLayoutColumn(layout, 0);
 	
-	uiItemR(col, NULL, 0, &imaptr, "source", 0);
+	uiItemR(col, &imaptr, "source", 0, NULL, 0);
 	
 	if (ELEM(RNA_enum_get(&imaptr, "source"), IMA_SRC_SEQUENCE, IMA_SRC_MOVIE)) {
 		col= uiLayoutColumn(layout, 1);
-		uiItemR(col, NULL, 0, ptr, "frames", 0);
-		uiItemR(col, NULL, 0, ptr, "start", 0);
-		uiItemR(col, NULL, 0, ptr, "offset", 0);
-		uiItemR(col, NULL, 0, ptr, "cyclic", 0);
-		uiItemR(col, NULL, 0, ptr, "auto_refresh", UI_ITEM_R_ICON_ONLY);
+		uiItemR(col, ptr, "frames", 0, NULL, 0);
+		uiItemR(col, ptr, "start", 0, NULL, 0);
+		uiItemR(col, ptr, "offset", 0, NULL, 0);
+		uiItemR(col, ptr, "cyclic", 0, NULL, 0);
+		uiItemR(col, ptr, "auto_refresh", UI_ITEM_R_ICON_ONLY, NULL, 0);
 	}
 
 	col= uiLayoutColumn(layout, 0);
 	
 	if (RNA_enum_get(&imaptr, "type")== IMA_TYPE_MULTILAYER)
-		uiItemR(col, NULL, 0, ptr, "layer", 0);
+		uiItemR(col, ptr, "layer", 0, NULL, 0);
 }
 
 static void node_composit_buts_renderlayers(uiLayout *layout, bContext *C, PointerRNA *ptr)
@@ -500,7 +500,7 @@ static void node_composit_buts_renderlayers(uiLayout *layout, bContext *C, Point
 
 	col= uiLayoutColumn(layout, 0);
 	row = uiLayoutRow(col, 0);
-	uiItemR(row, "", 0, ptr, "layer", 0);
+	uiItemR(row, ptr, "layer", 0, "", 0);
 	
 	prop = RNA_struct_find_property(ptr, "layer");
 	if (!(RNA_property_enum_identifier(C, ptr, prop, RNA_property_enum_get(ptr, prop), &layer_name)))
@@ -523,21 +523,21 @@ static void node_composit_buts_blur(uiLayout *layout, bContext *C, PointerRNA *p
 	
 	col= uiLayoutColumn(layout, 0);
 	
-	uiItemR(col, "", 0, ptr, "filter_type", 0);
+	uiItemR(col, ptr, "filter_type", 0, "", 0);
 	if (RNA_enum_get(ptr, "filter_type")!= R_FILTER_FAST_GAUSS) {
-		uiItemR(col, NULL, 0, ptr, "bokeh", 0);
-		uiItemR(col, NULL, 0, ptr, "gamma", 0);
+		uiItemR(col, ptr, "bokeh", 0, NULL, 0);
+		uiItemR(col, ptr, "gamma", 0, NULL, 0);
 	}
 	
-	uiItemR(col, NULL, 0, ptr, "relative", 0);
+	uiItemR(col, ptr, "relative", 0, NULL, 0);
 	col= uiLayoutColumn(layout, 1);
 	if (RNA_boolean_get(ptr, "relative")) {
-		uiItemR(col, "X", 0, ptr, "factor_x", 0);
-		uiItemR(col, "Y", 0, ptr, "factor_y", 0);
+		uiItemR(col, ptr, "factor_x", 0, "X", 0);
+		uiItemR(col, ptr, "factor_y", 0, "Y", 0);
 	}
 	else {
-		uiItemR(col, "X", 0, ptr, "sizex", 0);
-		uiItemR(col, "Y", 0, ptr, "sizey", 0);
+		uiItemR(col, ptr, "sizex", 0, "X", 0);
+		uiItemR(col, ptr, "sizey", 0, "Y", 0);
 	}
 }
 
@@ -545,24 +545,24 @@ static void node_composit_buts_dblur(uiLayout *layout, bContext *C, PointerRNA *
 {
 	uiLayout *col;
 	
-	uiItemR(layout, NULL, 0, ptr, "iterations", 0);
-	uiItemR(layout, NULL, 0, ptr, "wrap", 0);
+	uiItemR(layout, ptr, "iterations", 0, NULL, 0);
+	uiItemR(layout, ptr, "wrap", 0, NULL, 0);
 	
 	col= uiLayoutColumn(layout, 1);
 	uiItemL(col, "Center:", 0);
-	uiItemR(col, "X", 0, ptr, "center_x", 0);
-	uiItemR(col, "Y", 0, ptr, "center_y", 0);
+	uiItemR(col, ptr, "center_x", 0, "X", 0);
+	uiItemR(col, ptr, "center_y", 0, "Y", 0);
 	
 	uiItemS(layout);
 	
 	col= uiLayoutColumn(layout, 1);
-	uiItemR(col, NULL, 0, ptr, "distance", 0);
-	uiItemR(col, NULL, 0, ptr, "angle", 0);
+	uiItemR(col, ptr, "distance", 0, NULL, 0);
+	uiItemR(col, ptr, "angle", 0, NULL, 0);
 	
 	uiItemS(layout);
 	
-	uiItemR(layout, NULL, 0, ptr, "spin", 0);
-	uiItemR(layout, NULL, 0, ptr, "zoom", 0);
+	uiItemR(layout, ptr, "spin", 0, NULL, 0);
+	uiItemR(layout, ptr, "zoom", 0, NULL, 0);
 }
 
 static void node_composit_buts_bilateralblur(uiLayout *layout, bContext *C, PointerRNA *ptr)
@@ -570,9 +570,9 @@ static void node_composit_buts_bilateralblur(uiLayout *layout, bContext *C, Poin
 	uiLayout *col;
 	
 	col= uiLayoutColumn(layout, 1);
-	uiItemR(col, NULL, 0, ptr, "iterations", 0);
-	uiItemR(col, NULL, 0, ptr, "sigma_color", 0);
-	uiItemR(col, NULL, 0, ptr, "sigma_space", 0);
+	uiItemR(col, ptr, "iterations", 0, NULL, 0);
+	uiItemR(col, ptr, "sigma_color", 0, NULL, 0);
+	uiItemR(col, ptr, "sigma_space", 0, NULL, 0);
 }
 
 static void node_composit_buts_defocus(uiLayout *layout, bContext *C, PointerRNA *ptr)
@@ -581,59 +581,59 @@ static void node_composit_buts_defocus(uiLayout *layout, bContext *C, PointerRNA
 	
 	col= uiLayoutColumn(layout, 0);
 	uiItemL(col, "Bokeh Type:", 0);
-	uiItemR(col, "", 0, ptr, "bokeh", 0);
-	uiItemR(col, NULL, 0, ptr, "angle", 0);
+	uiItemR(col, ptr, "bokeh", 0, "", 0);
+	uiItemR(col, ptr, "angle", 0, NULL, 0);
 
-	uiItemR(layout, NULL, 0, ptr, "gamma_correction", 0);
+	uiItemR(layout, ptr, "gamma_correction", 0, NULL, 0);
 
 	col = uiLayoutColumn(layout, 0);
 	uiLayoutSetActive(col, RNA_boolean_get(ptr, "use_zbuffer")==1);
-	uiItemR(col, NULL, 0, ptr, "f_stop", 0);
+	uiItemR(col, ptr, "f_stop", 0, NULL, 0);
 
-	uiItemR(layout, NULL, 0, ptr, "max_blur", 0);
-	uiItemR(layout, NULL, 0, ptr, "threshold", 0);
+	uiItemR(layout, ptr, "max_blur", 0, NULL, 0);
+	uiItemR(layout, ptr, "threshold", 0, NULL, 0);
 
 	col = uiLayoutColumn(layout, 0);
-	uiItemR(col, NULL, 0, ptr, "preview", 0);
+	uiItemR(col, ptr, "preview", 0, NULL, 0);
 	sub = uiLayoutColumn(col, 0);
 	uiLayoutSetActive(sub, RNA_boolean_get(ptr, "preview"));
-	uiItemR(sub, NULL, 0, ptr, "samples", 0);
+	uiItemR(sub, ptr, "samples", 0, NULL, 0);
 	
 	col = uiLayoutColumn(layout, 0);
-	uiItemR(col, NULL, 0, ptr, "use_zbuffer", 0);
+	uiItemR(col, ptr, "use_zbuffer", 0, NULL, 0);
 	sub = uiLayoutColumn(col, 0);
 	uiLayoutSetActive(sub, RNA_boolean_get(ptr, "use_zbuffer")==0);
-	uiItemR(sub, NULL, 0, ptr, "z_scale", 0);
+	uiItemR(sub, ptr, "z_scale", 0, NULL, 0);
 }
 
 /* qdn: glare node */
 static void node_composit_buts_glare(uiLayout *layout, bContext *C, PointerRNA *ptr)
 {	
-	uiItemR(layout, "", 0, ptr, "glare_type", 0);
-	uiItemR(layout, "", 0, ptr, "quality", 0);
+	uiItemR(layout, ptr, "glare_type", 0, "", 0);
+	uiItemR(layout, ptr, "quality", 0, "", 0);
 
 	if (RNA_enum_get(ptr, "glare_type")!= 1) {
-		uiItemR(layout, NULL, 0, ptr, "iterations", 0);
+		uiItemR(layout, ptr, "iterations", 0, NULL, 0);
 	
 		if (RNA_enum_get(ptr, "glare_type")!= 0) 
-			uiItemR(layout, NULL, 0, ptr, "color_modulation", UI_ITEM_R_SLIDER);
+			uiItemR(layout, ptr, "color_modulation", UI_ITEM_R_SLIDER, NULL, 0);
 	}
 	
-	uiItemR(layout, NULL, 0, ptr, "mix", 0);		
-	uiItemR(layout, NULL, 0, ptr, "threshold", 0);
+	uiItemR(layout, ptr, "mix", 0, NULL, 0);		
+	uiItemR(layout, ptr, "threshold", 0, NULL, 0);
 
 	if (RNA_enum_get(ptr, "glare_type")== 2) {
-		uiItemR(layout, NULL, 0, ptr, "streaks", 0);		
-		uiItemR(layout, NULL, 0, ptr, "angle_offset", 0);
+		uiItemR(layout, ptr, "streaks", 0, NULL, 0);		
+		uiItemR(layout, ptr, "angle_offset", 0, NULL, 0);
 	}
 	if (RNA_enum_get(ptr, "glare_type")== 0 || RNA_enum_get(ptr, "glare_type")== 2) {
-		uiItemR(layout, NULL, 0, ptr, "fade", UI_ITEM_R_SLIDER);
+		uiItemR(layout, ptr, "fade", UI_ITEM_R_SLIDER, NULL, 0);
 		
 		if (RNA_enum_get(ptr, "glare_type")== 0) 
-			uiItemR(layout, NULL, 0, ptr, "rotate_45", 0);
+			uiItemR(layout, ptr, "rotate_45", 0, NULL, 0);
 	}
 	if (RNA_enum_get(ptr, "glare_type")== 1) {
-		uiItemR(layout, NULL, 0, ptr, "size", 0);
+		uiItemR(layout, ptr, "size", 0, NULL, 0);
 	}
 }
 
@@ -642,17 +642,17 @@ static void node_composit_buts_tonemap(uiLayout *layout, bContext *C, PointerRNA
 	uiLayout *col;
 
 	col = uiLayoutColumn(layout, 0);
-	uiItemR(col, "", 0, ptr, "tonemap_type", 0);
+	uiItemR(col, ptr, "tonemap_type", 0, "", 0);
 	if (RNA_enum_get(ptr, "tonemap_type")== 0) {
-		uiItemR(col, NULL, 0, ptr, "key", UI_ITEM_R_SLIDER);
-		uiItemR(col, NULL, 0, ptr, "offset", 0);
-		uiItemR(col, NULL, 0, ptr, "gamma", 0);
+		uiItemR(col, ptr, "key", UI_ITEM_R_SLIDER, NULL, 0);
+		uiItemR(col, ptr, "offset", 0, NULL, 0);
+		uiItemR(col, ptr, "gamma", 0, NULL, 0);
 	}
 	else {
-		uiItemR(col, NULL, 0, ptr, "intensity", 0);
-		uiItemR(col, NULL, 0, ptr, "contrast", UI_ITEM_R_SLIDER);
-		uiItemR(col, NULL, 0, ptr, "adaptation", UI_ITEM_R_SLIDER);
-		uiItemR(col, NULL, 0, ptr, "correction", UI_ITEM_R_SLIDER);
+		uiItemR(col, ptr, "intensity", 0, NULL, 0);
+		uiItemR(col, ptr, "contrast", UI_ITEM_R_SLIDER, NULL, 0);
+		uiItemR(col, ptr, "adaptation", UI_ITEM_R_SLIDER, NULL, 0);
+		uiItemR(col, ptr, "correction", UI_ITEM_R_SLIDER, NULL, 0);
 	}
 }
 
@@ -661,12 +661,12 @@ static void node_composit_buts_lensdist(uiLayout *layout, bContext *C, PointerRN
 	uiLayout *col;
 
 	col= uiLayoutColumn(layout, 0);
-	uiItemR(col, NULL, 0, ptr, "projector", 0);
+	uiItemR(col, ptr, "projector", 0, NULL, 0);
 
 	col = uiLayoutColumn(col, 0);
 	uiLayoutSetActive(col, RNA_boolean_get(ptr, "projector")==0);
-	uiItemR(col, NULL, 0, ptr, "jitter", 0);
-	uiItemR(col, NULL, 0, ptr, "fit", 0);
+	uiItemR(col, ptr, "jitter", 0, NULL, 0);
+	uiItemR(col, ptr, "fit", 0, NULL, 0);
 }
 
 static void node_composit_buts_vecblur(uiLayout *layout, bContext *C, PointerRNA *ptr)
@@ -674,38 +674,38 @@ static void node_composit_buts_vecblur(uiLayout *layout, bContext *C, PointerRNA
 	uiLayout *col;
 	
 	col= uiLayoutColumn(layout, 0);
-	uiItemR(col, NULL, 0, ptr, "samples", 0);
-	uiItemR(col, "Blur", 0, ptr, "factor", 0);
+	uiItemR(col, ptr, "samples", 0, NULL, 0);
+	uiItemR(col, ptr, "factor", 0, "Blur", 0);
 	
 	col= uiLayoutColumn(layout, 1);
 	uiItemL(col, "Speed:", 0);
-	uiItemR(col, "Min", 0, ptr, "min_speed", 0);
-	uiItemR(col, "Max", 0, ptr, "max_speed", 0);
+	uiItemR(col, ptr, "min_speed", 0, "Min", 0);
+	uiItemR(col, ptr, "max_speed", 0, "Max", 0);
 
-	uiItemR(layout, NULL, 0, ptr, "curved", 0);
+	uiItemR(layout, ptr, "curved", 0, NULL, 0);
 }
 
 static void node_composit_buts_filter(uiLayout *layout, bContext *C, PointerRNA *ptr)
 {
-	uiItemR(layout, "", 0, ptr, "filter_type", 0);
+	uiItemR(layout, ptr, "filter_type", 0, "", 0);
 }
 
 static void node_composit_buts_flip(uiLayout *layout, bContext *C, PointerRNA *ptr)
 {
-	uiItemR(layout, "", 0, ptr, "axis", 0);
+	uiItemR(layout, ptr, "axis", 0, "", 0);
 }
 
 static void node_composit_buts_crop(uiLayout *layout, bContext *C, PointerRNA *ptr)
 {
 	uiLayout *col;
 	
-	uiItemR(layout, NULL, 0, ptr, "crop_size", 0);
+	uiItemR(layout, ptr, "crop_size", 0, NULL, 0);
 	
 	col= uiLayoutColumn(layout, 1);
-	uiItemR(col, "Left", 0, ptr, "x1", 0);
-	uiItemR(col, "Right", 0, ptr, "x2", 0);
-	uiItemR(col, "Up", 0, ptr, "y1", 0);
-	uiItemR(col, "Down", 0, ptr, "y2", 0);
+	uiItemR(col, ptr, "x1", 0, "Left", 0);
+	uiItemR(col, ptr, "x2", 0, "Right", 0);
+	uiItemR(col, ptr, "y1", 0, "Up", 0);
+	uiItemR(col, ptr, "y2", 0, "Down", 0);
 }
 
 static void node_composit_buts_splitviewer(uiLayout *layout, bContext *C, PointerRNA *ptr)
@@ -714,8 +714,8 @@ static void node_composit_buts_splitviewer(uiLayout *layout, bContext *C, Pointe
 	
 	col= uiLayoutColumn(layout, 0);
 	row= uiLayoutRow(col, 0);
-	uiItemR(row, NULL, 0, ptr, "axis", UI_ITEM_R_EXPAND);
-	uiItemR(col, NULL, 0, ptr, "factor", 0);
+	uiItemR(row, ptr, "axis", UI_ITEM_R_EXPAND, NULL, 0);
+	uiItemR(col, ptr, "factor", 0, NULL, 0);
 }
 
 static void node_composit_buts_map_value(uiLayout *layout, bContext *C, PointerRNA *ptr)
@@ -723,20 +723,20 @@ static void node_composit_buts_map_value(uiLayout *layout, bContext *C, PointerR
 	uiLayout *sub, *col;
 	
 	col =uiLayoutColumn(layout, 1);
-	uiItemR(col, NULL, 0, ptr, "offset", 0);
-	uiItemR(col, NULL, 0, ptr, "size", 0);
+	uiItemR(col, ptr, "offset", 0, NULL, 0);
+	uiItemR(col, ptr, "size", 0, NULL, 0);
 	
 	col =uiLayoutColumn(layout, 1);
-	uiItemR(col, NULL, 0, ptr, "use_min", 0);
+	uiItemR(col, ptr, "use_min", 0, NULL, 0);
 	sub =uiLayoutColumn(col, 0);
 	uiLayoutSetActive(sub, RNA_boolean_get(ptr, "use_min"));
-	uiItemR(sub, "", 0, ptr, "min", 0);
+	uiItemR(sub, ptr, "min", 0, "", 0);
 	
 	col =uiLayoutColumn(layout, 1);
-	uiItemR(col, NULL, 0, ptr, "use_max", 0);
+	uiItemR(col, ptr, "use_max", 0, NULL, 0);
 	sub =uiLayoutColumn(col, 0);
 	uiLayoutSetActive(sub, RNA_boolean_get(ptr, "use_max"));
-	uiItemR(sub, "", 0, ptr, "max", 0);
+	uiItemR(sub, ptr, "max", 0, "", 0);
 }
 
 static void node_composit_buts_alphaover(uiLayout *layout, bContext *C, PointerRNA *ptr)
@@ -744,8 +744,8 @@ static void node_composit_buts_alphaover(uiLayout *layout, bContext *C, PointerR
 	uiLayout *col;
 	
 	col =uiLayoutColumn(layout, 1);
-	uiItemR(col, NULL, 0, ptr, "convert_premul", 0);
-	uiItemR(col, NULL, 0, ptr, "premul", 0);
+	uiItemR(col, ptr, "convert_premul", 0, NULL, 0);
+	uiItemR(col, ptr, "premul", 0, NULL, 0);
 }
 
 static void node_composit_buts_hue_sat(uiLayout *layout, bContext *C, PointerRNA *ptr)
@@ -753,14 +753,14 @@ static void node_composit_buts_hue_sat(uiLayout *layout, bContext *C, PointerRNA
 	uiLayout *col;
 	
 	col =uiLayoutColumn(layout, 0);
-	uiItemR(col, NULL, 0, ptr, "hue", UI_ITEM_R_SLIDER);
-	uiItemR(col, NULL, 0, ptr, "sat", UI_ITEM_R_SLIDER);
-	uiItemR(col, NULL, 0, ptr, "val", UI_ITEM_R_SLIDER);
+	uiItemR(col, ptr, "hue", UI_ITEM_R_SLIDER, NULL, 0);
+	uiItemR(col, ptr, "sat", UI_ITEM_R_SLIDER, NULL, 0);
+	uiItemR(col, ptr, "val", UI_ITEM_R_SLIDER, NULL, 0);
 }
 
 static void node_composit_buts_dilateerode(uiLayout *layout, bContext *C, PointerRNA *ptr)
 {
-	uiItemR(layout, NULL, 0, ptr, "distance", 0);
+	uiItemR(layout, ptr, "distance", 0, NULL, 0);
 }
 
 static void node_composit_buts_diff_matte(uiLayout *layout, bContext *C, PointerRNA *ptr)
@@ -768,8 +768,8 @@ static void node_composit_buts_diff_matte(uiLayout *layout, bContext *C, Pointer
 	uiLayout *col;
 	
 	col =uiLayoutColumn(layout, 1);
-	uiItemR(col, NULL, 0, ptr, "tolerance", UI_ITEM_R_SLIDER);
-	uiItemR(col, NULL, 0, ptr, "falloff", UI_ITEM_R_SLIDER);
+	uiItemR(col, ptr, "tolerance", UI_ITEM_R_SLIDER, NULL, 0);
+	uiItemR(col, ptr, "falloff", UI_ITEM_R_SLIDER, NULL, 0);
 }
 
 static void node_composit_buts_distance_matte(uiLayout *layout, bContext *C, PointerRNA *ptr)
@@ -777,8 +777,8 @@ static void node_composit_buts_distance_matte(uiLayout *layout, bContext *C, Poi
 	uiLayout *col;
 	
 	col =uiLayoutColumn(layout, 1);
-	uiItemR(col, NULL, 0, ptr, "tolerance", UI_ITEM_R_SLIDER);
-	uiItemR(col, NULL, 0, ptr, "falloff", UI_ITEM_R_SLIDER);
+	uiItemR(col, ptr, "tolerance", UI_ITEM_R_SLIDER, NULL, 0);
+	uiItemR(col, ptr, "falloff", UI_ITEM_R_SLIDER, NULL, 0);
 }
 
 static void node_composit_buts_color_spill(uiLayout *layout, bContext *C, PointerRNA *ptr)
@@ -787,23 +787,23 @@ static void node_composit_buts_color_spill(uiLayout *layout, bContext *C, Pointe
 	
    uiItemL(layout, "Despill Channel:", 0);
    row =uiLayoutRow(layout,0);
-	uiItemR(row, NULL, 0, ptr, "channel", UI_ITEM_R_EXPAND);
+	uiItemR(row, ptr, "channel", UI_ITEM_R_EXPAND, NULL, 0);
 
    col= uiLayoutColumn(layout, 0);
-   uiItemR(col, NULL, 0, ptr, "algorithm", 0);
+   uiItemR(col, ptr, "algorithm", 0, NULL, 0);
 
    if(RNA_enum_get(ptr, "algorithm")==0) {
 	  uiItemL(col, "Limiting Channel:", 0);
 	  row=uiLayoutRow(col,0);
-	  uiItemR(row, NULL, 0, ptr, "limit_channel", UI_ITEM_R_EXPAND);
+	  uiItemR(row, ptr, "limit_channel", UI_ITEM_R_EXPAND, NULL, 0);
    }
 
-   uiItemR(col, NULL, 0, ptr, "ratio", UI_ITEM_R_SLIDER);
-   uiItemR(col, NULL, 0, ptr, "unspill", 0);   
+   uiItemR(col, ptr, "ratio", UI_ITEM_R_SLIDER, NULL, 0);
+   uiItemR(col, ptr, "unspill", 0, NULL, 0);   
    if (RNA_enum_get(ptr, "unspill")== 1) {
-	  uiItemR(col, NULL, 0, ptr, "unspill_red", UI_ITEM_R_SLIDER);
-	  uiItemR(col, NULL, 0, ptr, "unspill_green", UI_ITEM_R_SLIDER);
-	  uiItemR(col, NULL, 0, ptr, "unspill_blue", UI_ITEM_R_SLIDER);
+	  uiItemR(col, ptr, "unspill_red", UI_ITEM_R_SLIDER, NULL, 0);
+	  uiItemR(col, ptr, "unspill_green", UI_ITEM_R_SLIDER, NULL, 0);
+	  uiItemR(col, ptr, "unspill_blue", UI_ITEM_R_SLIDER, NULL, 0);
    }
 }
 
@@ -812,13 +812,13 @@ static void node_composit_buts_chroma_matte(uiLayout *layout, bContext *C, Point
 	uiLayout *col;
 	
 	col= uiLayoutColumn(layout, 0);
-	uiItemR(col, NULL, 0, ptr, "acceptance", 0);
-	uiItemR(col, NULL, 0, ptr, "cutoff", 0);
+	uiItemR(col, ptr, "acceptance", 0, NULL, 0);
+	uiItemR(col, ptr, "cutoff", 0, NULL, 0);
 	
 	col= uiLayoutColumn(layout, 1);
-	uiItemR(col, NULL, 0, ptr, "lift", UI_ITEM_R_SLIDER);
-	uiItemR(col, NULL, 0, ptr, "gain", UI_ITEM_R_SLIDER);
-	uiItemR(col, NULL, 0, ptr, "shadow_adjust", UI_ITEM_R_SLIDER);
+	uiItemR(col, ptr, "lift", UI_ITEM_R_SLIDER, NULL, 0);
+	uiItemR(col, ptr, "gain", UI_ITEM_R_SLIDER, NULL, 0);
+	uiItemR(col, ptr, "shadow_adjust", UI_ITEM_R_SLIDER, NULL, 0);
 }
 
 static void node_composit_buts_color_matte(uiLayout *layout, bContext *C, PointerRNA *ptr)
@@ -826,9 +826,9 @@ static void node_composit_buts_color_matte(uiLayout *layout, bContext *C, Pointe
 	uiLayout *col;
 	
 	col= uiLayoutColumn(layout, 1);
-	uiItemR(col, NULL, 0, ptr, "h", UI_ITEM_R_SLIDER);
-	uiItemR(col, NULL, 0, ptr, "s", UI_ITEM_R_SLIDER);
-	uiItemR(col, NULL, 0, ptr, "v", UI_ITEM_R_SLIDER);
+	uiItemR(col, ptr, "h", UI_ITEM_R_SLIDER, NULL, 0);
+	uiItemR(col, ptr, "s", UI_ITEM_R_SLIDER, NULL, 0);
+	uiItemR(col, ptr, "v", UI_ITEM_R_SLIDER, NULL, 0);
 }
 
 static void node_composit_buts_channel_matte(uiLayout *layout, bContext *C, PointerRNA *ptr)
@@ -837,24 +837,24 @@ static void node_composit_buts_channel_matte(uiLayout *layout, bContext *C, Poin
 
    uiItemL(layout, "Color Space:", 0);
 	row= uiLayoutRow(layout, 0);
-	uiItemR(row, NULL, 0, ptr, "color_space", UI_ITEM_R_EXPAND);
+	uiItemR(row, ptr, "color_space", UI_ITEM_R_EXPAND, NULL, 0);
 
    col=uiLayoutColumn(layout, 0);  
    uiItemL(col, "Key Channel:", 0);
 	row= uiLayoutRow(col, 0);
-	uiItemR(row, NULL, 0, ptr, "channel", UI_ITEM_R_EXPAND);
+	uiItemR(row, ptr, "channel", UI_ITEM_R_EXPAND, NULL, 0);
 
 	col =uiLayoutColumn(layout, 0);
 
-   uiItemR(col, NULL, 0, ptr, "algorithm", 0);
+   uiItemR(col, ptr, "algorithm", 0, NULL, 0);
    if(RNA_enum_get(ptr, "algorithm")==0) {
 	  uiItemL(col, "Limiting Channel:", 0);
 	  row=uiLayoutRow(col,0);
-	  uiItemR(row, NULL, 0, ptr, "limit_channel", UI_ITEM_R_EXPAND);
+	  uiItemR(row, ptr, "limit_channel", UI_ITEM_R_EXPAND, NULL, 0);
    }
    
-	uiItemR(col, NULL, 0, ptr, "high", UI_ITEM_R_SLIDER);
-	uiItemR(col, NULL, 0, ptr, "low", UI_ITEM_R_SLIDER);
+	uiItemR(col, ptr, "high", UI_ITEM_R_SLIDER, NULL, 0);
+	uiItemR(col, ptr, "low", UI_ITEM_R_SLIDER, NULL, 0);
 }
 
 static void node_composit_buts_luma_matte(uiLayout *layout, bContext *C, PointerRNA *ptr)
@@ -862,18 +862,18 @@ static void node_composit_buts_luma_matte(uiLayout *layout, bContext *C, Pointer
 	uiLayout *col;
 	
 	col= uiLayoutColumn(layout, 1);
-	uiItemR(col, NULL, 0, ptr, "high", UI_ITEM_R_SLIDER);
-	uiItemR(col, NULL, 0, ptr, "low", UI_ITEM_R_SLIDER);
+	uiItemR(col, ptr, "high", UI_ITEM_R_SLIDER, NULL, 0);
+	uiItemR(col, ptr, "low", UI_ITEM_R_SLIDER, NULL, 0);
 }
 
 static void node_composit_buts_map_uv(uiLayout *layout, bContext *C, PointerRNA *ptr)
 {
-	uiItemR(layout, NULL, 0, ptr, "alpha", 0);
+	uiItemR(layout, ptr, "alpha", 0, NULL, 0);
 }
 
 static void node_composit_buts_id_mask(uiLayout *layout, bContext *C, PointerRNA *ptr)
 {
-	uiItemR(layout, NULL, 0, ptr, "index", 0);
+	uiItemR(layout, ptr, "index", 0, NULL, 0);
 }
 
 static void node_composit_buts_file_output(uiLayout *layout, bContext *C, PointerRNA *ptr)
@@ -881,31 +881,31 @@ static void node_composit_buts_file_output(uiLayout *layout, bContext *C, Pointe
 	uiLayout *col, *row;
 
 	col= uiLayoutColumn(layout, 0);
-	uiItemR(col, "", 0, ptr, "filename", 0);
-	uiItemR(col, "", 0, ptr, "image_type", 0);
+	uiItemR(col, ptr, "filename", 0, "", 0);
+	uiItemR(col, ptr, "image_type", 0, "", 0);
 	
 	row= uiLayoutRow(layout, 0);
 	if (RNA_enum_get(ptr, "image_type")== R_OPENEXR) {
-		uiItemR(row, NULL, 0, ptr, "exr_half", 0);
-		uiItemR(row, "", 0, ptr, "exr_codec", 0);
+		uiItemR(row, ptr, "exr_half", 0, NULL, 0);
+		uiItemR(row, ptr, "exr_codec", 0, "", 0);
 	}
 	else if (RNA_enum_get(ptr, "image_type")== R_JPEG90) {
-		uiItemR(row, NULL, 0, ptr, "quality", UI_ITEM_R_SLIDER);
+		uiItemR(row, ptr, "quality", UI_ITEM_R_SLIDER, NULL, 0);
 	}
 	
 	row= uiLayoutRow(layout, 1);
-	uiItemR(row, "Start", 0, ptr, "start_frame", 0);
-	uiItemR(row, "End", 0, ptr, "end_frame", 0);
+	uiItemR(row, ptr, "start_frame", 0, "Start", 0);
+	uiItemR(row, ptr, "end_frame", 0, "End", 0);
 }
 
 static void node_composit_buts_scale(uiLayout *layout, bContext *C, PointerRNA *ptr)
 {
-	uiItemR(layout, "", 0, ptr, "space", 0);
+	uiItemR(layout, ptr, "space", 0, "", 0);
 }
 
 static void node_composit_buts_rotate(uiLayout *layout, bContext *C, PointerRNA *ptr)
 {
-   uiItemR(layout, "", 0, ptr, "filter", 0);
+   uiItemR(layout, ptr, "filter", 0, "", 0);
 }
 
 static void node_composit_buts_invert(uiLayout *layout, bContext *C, PointerRNA *ptr)
@@ -913,25 +913,25 @@ static void node_composit_buts_invert(uiLayout *layout, bContext *C, PointerRNA
 	uiLayout *col;
 	
 	col= uiLayoutColumn(layout, 0);
-	uiItemR(col, NULL, 0, ptr, "rgb", 0);
-	uiItemR(col, NULL, 0, ptr, "alpha", 0);
+	uiItemR(col, ptr, "rgb", 0, NULL, 0);
+	uiItemR(col, ptr, "alpha", 0, NULL, 0);
 }
 
 static void node_composit_buts_premulkey(uiLayout *layout, bContext *C, PointerRNA *ptr)
 {
-	uiItemR(layout, "", 0, ptr, "mapping", 0);
+	uiItemR(layout, ptr, "mapping", 0, "", 0);
 }
 
 static void node_composit_buts_view_levels(uiLayout *layout, bContext *C, PointerRNA *ptr)
 {
-	uiItemR(layout, NULL, 0, ptr, "channel", UI_ITEM_R_EXPAND);
+	uiItemR(layout, ptr, "channel", UI_ITEM_R_EXPAND, NULL, 0);
 }
 
 static void node_composit_buts_colorbalance(uiLayout *layout, bContext *C, PointerRNA *ptr)
 {
 	uiLayout *split, *col, *row;
 	
-	uiItemR(layout, NULL, 0, ptr, "correction_formula", 0);
+	uiItemR(layout, ptr, "correction_formula", 0, NULL, 0);
 	
 	if (RNA_enum_get(ptr, "correction_formula")== 0) {
 	
@@ -939,17 +939,17 @@ static void node_composit_buts_colorbalance(uiLayout *layout, bContext *C, Point
 		col = uiLayoutColumn(split, 0);
 		uiTemplateColorWheel(col, ptr, "lift", 1, 1);
 		row = uiLayoutRow(col, 0);
-		uiItemR(row, NULL, 0, ptr, "lift", 0);
+		uiItemR(row, ptr, "lift", 0, NULL, 0);
 		
 		col = uiLayoutColumn(split, 0);
 		uiTemplateColorWheel(col, ptr, "gamma", 1, 1);
 		row = uiLayoutRow(col, 0);
-		uiItemR(row, NULL, 0, ptr, "gamma", 0);
+		uiItemR(row, ptr, "gamma", 0, NULL, 0);
 		
 		col = uiLayoutColumn(split, 0);
 		uiTemplateColorWheel(col, ptr, "gain", 1, 1);
 		row = uiLayoutRow(col, 0);
-		uiItemR(row, NULL, 0, ptr, "gain", 0);
+		uiItemR(row, ptr, "gain", 0, NULL, 0);
 
 	} else {
 		
@@ -957,17 +957,17 @@ static void node_composit_buts_colorbalance(uiLayout *layout, bContext *C, Point
 		col = uiLayoutColumn(split, 0);
 		uiTemplateColorWheel(col, ptr, "offset", 1, 1);
 		row = uiLayoutRow(col, 0);
-		uiItemR(row, NULL, 0, ptr, "offset", 0);
+		uiItemR(row, ptr, "offset", 0, NULL, 0);
 		
 		col = uiLayoutColumn(split, 0);
 		uiTemplateColorWheel(col, ptr, "power", 1, 1);
 		row = uiLayoutRow(col, 0);
-		uiItemR(row, NULL, 0, ptr, "power", 0);
+		uiItemR(row, ptr, "power", 0, NULL, 0);
 		
 		col = uiLayoutColumn(split, 0);
 		uiTemplateColorWheel(col, ptr, "slope", 1, 1);
 		row = uiLayoutRow(col, 0);
-		uiItemR(row, NULL, 0, ptr, "slope", 0);
+		uiItemR(row, ptr, "slope", 0, NULL, 0);
 	}
 
 }
@@ -1130,12 +1130,12 @@ static void node_texture_buts_bricks(uiLayout *layout, bContext *C, PointerRNA *
 	uiLayout *col;
 	
 	col= uiLayoutColumn(layout, 1);
-	uiItemR(col, "Offset", 0, ptr, "offset", 0);
-	uiItemR(col, "Frequency", 0, ptr, "offset_frequency", 0);
+	uiItemR(col, ptr, "offset", 0, "Offset", 0);
+	uiItemR(col, ptr, "offset_frequency", 0, "Frequency", 0);
 	
 	col= uiLayoutColumn(layout, 1);
-	uiItemR(col, "Squash", 0, ptr, "squash", 0);
-	uiItemR(col, "Frequency", 0, ptr, "squash_frequency", 0);
+	uiItemR(col, ptr, "squash", 0, "Squash", 0);
+	uiItemR(col, ptr, "squash_frequency", 0, "Frequency", 0);
 }
 
 static void node_texture_buts_proc(uiLayout *layout, bContext *C, PointerRNA *ptr)
@@ -1152,42 +1152,42 @@ static void node_texture_buts_proc(uiLayout *layout, bContext *C, PointerRNA *pt
 
 	switch( tex->type ) {
 		case TEX_BLEND:
-			uiItemR(col, "", 0, &tex_ptr, "progression", 0);
+			uiItemR(col, &tex_ptr, "progression", 0, "", 0);
 			row= uiLayoutRow(col, 0);
-			uiItemR(row, NULL, 0, &tex_ptr, "flip_axis", UI_ITEM_R_EXPAND);
+			uiItemR(row, &tex_ptr, "flip_axis", UI_ITEM_R_EXPAND, NULL, 0);
 			break;
 
 		case TEX_MARBLE:
 			row= uiLayoutRow(col, 0);
-			uiItemR(row, NULL, 0, &tex_ptr, "stype", UI_ITEM_R_EXPAND);
+			uiItemR(row, &tex_ptr, "stype", UI_ITEM_R_EXPAND, NULL, 0);
 			row= uiLayoutRow(col, 0);
-			uiItemR(row, NULL, 0, &tex_ptr, "noise_type", UI_ITEM_R_EXPAND);
+			uiItemR(row, &tex_ptr, "noise_type", UI_ITEM_R_EXPAND, NULL, 0);
 			row= uiLayoutRow(col, 0);
-			uiItemR(row, NULL, 0, &tex_ptr, "noisebasis2", UI_ITEM_R_EXPAND);
+			uiItemR(row, &tex_ptr, "noisebasis2", UI_ITEM_R_EXPAND, NULL, 0);
 			break;
 
 		case TEX_WOOD:
-			uiItemR(col, "", 0, &tex_ptr, "noise_basis", 0);
-			uiItemR(col, "", 0, &tex_ptr, "stype", 0);
+			uiItemR(col, &tex_ptr, "noise_basis", 0, "", 0);
+			uiItemR(col, &tex_ptr, "stype", 0, "", 0);
 			row= uiLayoutRow(col, 0);
-			uiItemR(row, NULL, 0, &tex_ptr, "noisebasis2", UI_ITEM_R_EXPAND);
+			uiItemR(row, &tex_ptr, "noisebasis2", UI_ITEM_R_EXPAND, NULL, 0);
 			row= uiLayoutRow(col, 0);
 			uiLayoutSetActive(row, !(RNA_enum_get(&tex_ptr, "stype")==TEX_BAND || RNA_enum_get(&tex_ptr, "stype")==TEX_RING)); 
-			uiItemR(row, NULL, 0, &tex_ptr, "noise_type", UI_ITEM_R_EXPAND);
+			uiItemR(row, &tex_ptr, "noise_type", UI_ITEM_R_EXPAND, NULL, 0);
 			break;
 			
 		case TEX_CLOUDS:
-			uiItemR(col, "", 0, &tex_ptr, "noise_basis", 0);
+			uiItemR(col, &tex_ptr, "noise_basis", 0, "", 0);
 			row= uiLayoutRow(col, 0);
-			uiItemR(row, NULL, 0, &tex_ptr, "stype", UI_ITEM_R_EXPAND);
+			uiItemR(row, &tex_ptr, "stype", UI_ITEM_R_EXPAND, NULL, 0);
 			row= uiLayoutRow(col, 0);
-			uiItemR(row, NULL, 0, &tex_ptr, "noise_type", UI_ITEM_R_EXPAND);
-			uiItemR(col, "Depth", 0, &tex_ptr, "noise_depth", UI_ITEM_R_EXPAND);
+			uiItemR(row, &tex_ptr, "noise_type", UI_ITEM_R_EXPAND, NULL, 0);
+			uiItemR(col, &tex_ptr, "noise_depth", UI_ITEM_R_EXPAND, "Depth", 0);
 			break;
 			
 		case TEX_DISTNOISE:
-			uiItemR(col, "", 0, &tex_ptr, "noise_basis", 0);
-			uiItemR(col, "", 0, &tex_ptr, "noise_distortion", 0);
+			uiItemR(col, &tex_ptr, "noise_basis", 0, "", 0);
+			uiItemR(col, &tex_ptr, "noise_distortion", 0, "", 0);
 			break;
 	}
 }
@@ -1199,7 +1199,7 @@ static void node_texture_buts_image(uiLayout *layout, bContext *C, PointerRNA *p
 
 static void node_texture_buts_output(uiLayout *layout, bContext *C, PointerRNA *ptr)
 {
-	uiItemR(layout, "", 0, ptr, "output_name", 0);
+	uiItemR(layout, ptr, "output_name", 0, "", 0);
 }
 
 /* only once called */
diff --git a/source/blender/editors/space_node/node_buttons.c b/source/blender/editors/space_node/node_buttons.c
index a1abb21c97f..41cf689407b 100644
--- a/source/blender/editors/space_node/node_buttons.c
+++ b/source/blender/editors/space_node/node_buttons.c
@@ -114,7 +114,7 @@ static void active_node_panel(const bContext *C, Panel *pa)
 	uiBlockSetHandleFunc(block, do_node_region_buttons, NULL);
 	
 	/* draw this node's name, etc. */
-	uiItemR(layout, NULL, ICON_NODE, &ptr, "name", 0);
+	uiItemR(layout, &ptr, "name", 0, NULL, ICON_NODE);
 	// TODO: a separator would be nice...
 	
 	/* draw this node's settings */
diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c
index 114c1566bae..50f9d84ce71 100644
--- a/source/blender/editors/space_node/node_draw.c
+++ b/source/blender/editors/space_node/node_draw.c
@@ -583,7 +583,7 @@ static uiBlock *socket_vector_menu(bContext *C, ARegion *ar, void *socket_v)
 	
 	layout= uiLayoutColumn(uiBlockLayout(block, UI_LAYOUT_VERTICAL, UI_LAYOUT_PANEL, sock->locx, sock->locy-8, 140, 20, U.uistyles.first), 0);
 	
-	uiItemR(layout, "", 0, &ptr, "default_value", UI_ITEM_R_EXPAND);
+	uiItemR(layout, &ptr, "default_value", UI_ITEM_R_EXPAND, "", 0);
 	
 	return block;
 }
diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c
index 56c5efb8b41..b463d07677b 100644
--- a/source/blender/editors/space_view3d/view3d_buttons.c
+++ b/source/blender/editors/space_view3d/view3d_buttons.c
@@ -743,57 +743,57 @@ static void v3d_transform_butsR(uiLayout *layout, PointerRNA *ptr)
 		uiLayoutSetActive(split, !(bone->parent && bone->flag & BONE_CONNECTED));
 	}
 	colsub = uiLayoutColumn(split, 1);
-	uiItemR(colsub, "Location", 0, ptr, "location", 0);
+	uiItemR(colsub, ptr, "location", 0, "Location", 0);
 	colsub = uiLayoutColumn(split, 1);
 	uiItemL(colsub, "", 0);
-	uiItemR(colsub, "", ICON_LOCKED, ptr, "lock_location", UI_ITEM_R_TOGGLE+UI_ITEM_R_ICON_ONLY);
+	uiItemR(colsub, ptr, "lock_location", UI_ITEM_R_TOGGLE+UI_ITEM_R_ICON_ONLY, "", ICON_LOCKED);
 	
 	split = uiLayoutSplit(layout, 0.8, 0);
 	
 	switch(RNA_enum_get(ptr, "rotation_mode")) {
 		case ROT_MODE_QUAT: /* quaternion */
 			colsub = uiLayoutColumn(split, 1);
-			uiItemR(colsub, "Rotation", 0, ptr, "rotation_quaternion", 0);
+			uiItemR(colsub, ptr, "rotation_quaternion", 0, "Rotation", 0);
 			colsub = uiLayoutColumn(split, 1);
-			uiItemR(colsub, "4L", 0, ptr, "lock_rotations_4d", UI_ITEM_R_TOGGLE);
+			uiItemR(colsub, ptr, "lock_rotations_4d", UI_ITEM_R_TOGGLE, "4L", 0);
 			if (RNA_boolean_get(ptr, "lock_rotations_4d"))
-				uiItemR(colsub, "", ICON_LOCKED, ptr, "lock_rotation_w", UI_ITEM_R_TOGGLE+UI_ITEM_R_ICON_ONLY);
+				uiItemR(colsub, ptr, "lock_rotation_w", UI_ITEM_R_TOGGLE+UI_ITEM_R_ICON_ONLY, "", ICON_LOCKED);
 			else
 				uiItemL(colsub, "", 0);
-			uiItemR(colsub, "", ICON_LOCKED, ptr, "lock_rotation", UI_ITEM_R_TOGGLE+UI_ITEM_R_ICON_ONLY);
+			uiItemR(colsub, ptr, "lock_rotation", UI_ITEM_R_TOGGLE+UI_ITEM_R_ICON_ONLY, "", ICON_LOCKED);
 			break;
 		case ROT_MODE_AXISANGLE: /* axis angle */
 			colsub = uiLayoutColumn(split, 1);
-			uiItemR(colsub, "Rotation", 0, ptr, "rotation_axis_angle", 0);
+			uiItemR(colsub, ptr, "rotation_axis_angle", 0, "Rotation", 0);
 			colsub = uiLayoutColumn(split, 1);
-			uiItemR(colsub, "4L", 0, ptr, "lock_rotations_4d", UI_ITEM_R_TOGGLE);
+			uiItemR(colsub, ptr, "lock_rotations_4d", UI_ITEM_R_TOGGLE, "4L", 0);
 			if (RNA_boolean_get(ptr, "lock_rotations_4d"))
-				uiItemR(colsub, "", ICON_LOCKED, ptr, "lock_rotation_w", UI_ITEM_R_TOGGLE+UI_ITEM_R_ICON_ONLY);
+				uiItemR(colsub, ptr, "lock_rotation_w", UI_ITEM_R_TOGGLE+UI_ITEM_R_ICON_ONLY, "", ICON_LOCKED);
 			else
 				uiItemL(colsub, "", 0);
-			uiItemR(colsub, "", ICON_LOCKED, ptr, "lock_rotation", UI_ITEM_R_TOGGLE+UI_ITEM_R_ICON_ONLY);
+			uiItemR(colsub, ptr, "lock_rotation", UI_ITEM_R_TOGGLE+UI_ITEM_R_ICON_ONLY, "", ICON_LOCKED);
 			break;
 		default: /* euler rotations */
 			colsub = uiLayoutColumn(split, 1);
-			uiItemR(colsub, "Rotation", 0, ptr, "rotation_euler", 0);
+			uiItemR(colsub, ptr, "rotation_euler", 0, "Rotation", 0);
 			colsub = uiLayoutColumn(split, 1);
 			uiItemL(colsub, "", 0);
-			uiItemR(colsub, "", ICON_LOCKED, ptr, "lock_rotation", UI_ITEM_R_TOGGLE+UI_ITEM_R_ICON_ONLY);
+			uiItemR(colsub, ptr, "lock_rotation", UI_ITEM_R_TOGGLE+UI_ITEM_R_ICON_ONLY, "", ICON_LOCKED);
 			break;
 	}
-	uiItemR(layout, "", 0, ptr, "rotation_mode", 0);
+	uiItemR(layout, ptr, "rotation_mode", 0, "", 0);
 	
 	split = uiLayoutSplit(layout, 0.8, 0);
 	colsub = uiLayoutColumn(split, 1);
-	uiItemR(colsub, "Scale", 0, ptr, "scale", 0);
+	uiItemR(colsub, ptr, "scale", 0, "Scale", 0);
 	colsub = uiLayoutColumn(split, 1);
 	uiItemL(colsub, "", 0);
-	uiItemR(colsub, "", ICON_LOCKED, ptr, "lock_scale", UI_ITEM_R_TOGGLE+UI_ITEM_R_ICON_ONLY);
+	uiItemR(colsub, ptr, "lock_scale", UI_ITEM_R_TOGGLE+UI_ITEM_R_ICON_ONLY, "", ICON_LOCKED);
 	
 	if (ptr->type == &RNA_Object) {
 		Object *ob = ptr->data;
 		if (ELEM5(ob->type, OB_MESH, OB_CURVE, OB_SURF, OB_FONT, OB_MBALL))
-			uiItemR(layout, "Dimensions", 0, ptr, "dimensions", 0);
+			uiItemR(layout, ptr, "dimensions", 0, "Dimensions", 0);
 	}
 }
 
@@ -919,18 +919,18 @@ static void v3d_editarmature_buts(uiLayout *layout, View3D *v3d, Object *ob, flo
 
 
 	col= uiLayoutColumn(layout, 0);
-	uiItemR(col, "Head", 0, &eboneptr, "head", 0);
+	uiItemR(col, &eboneptr, "head", 0, "Head", 0);
 	if (ebone->parent && ebone->flag & BONE_CONNECTED ) {
 		PointerRNA parptr = RNA_pointer_get(&eboneptr, "parent");
-		uiItemR(col, "Radius", 0, &parptr, "tail_radius", 0);
+		uiItemR(col, &parptr, "tail_radius", 0, "Radius", 0);
 	} else {
-		uiItemR(col, "Radius", 0, &eboneptr, "head_radius", 0);
+		uiItemR(col, &eboneptr, "head_radius", 0, "Radius", 0);
 	}
 	
-	uiItemR(col, "Tail", 0, &eboneptr, "tail", 0);
-	uiItemR(col, "Radius", 0, &eboneptr, "tail_radius", 0);
+	uiItemR(col, &eboneptr, "tail", 0, "Tail", 0);
+	uiItemR(col, &eboneptr, "tail_radius", 0, "Radius", 0);
 	
-	uiItemR(col, "Roll", 0, &eboneptr, "roll", 0);
+	uiItemR(col, &eboneptr, "roll", 0, "Roll", 0);
 }
 
 static void v3d_editmetaball_buts(uiLayout *layout, Object *ob, float lim)
@@ -949,12 +949,12 @@ static void v3d_editmetaball_buts(uiLayout *layout, Object *ob, float lim)
 	RNA_pointer_create(&mball->id, &RNA_MetaElement, mball->lastelem, &ptr);
 	
 	col= uiLayoutColumn(layout, 0);
-	uiItemR(col, "Location", 0, &ptr, "location", 0);
+	uiItemR(col, &ptr, "location", 0, "Location", 0);
 	
-	uiItemR(col, "Radius", 0, &ptr, "radius", 0);
-	uiItemR(col, "Stiffness", 0, &ptr, "stiffness", 0);
+	uiItemR(col, &ptr, "radius", 0, "Radius", 0);
+	uiItemR(col, &ptr, "stiffness", 0, "Stiffness", 0);
 	
-	uiItemR(col, "Type", 0, &ptr, "type", 0);
+	uiItemR(col, &ptr, "type", 0, "Type", 0);
 	
 	col= uiLayoutColumn(layout, 1);
 	switch (RNA_enum_get(&ptr, "type")) {
@@ -962,24 +962,24 @@ static void v3d_editmetaball_buts(uiLayout *layout, Object *ob, float lim)
 			break;
 		case MB_CUBE:
 			uiItemL(col, "Size:", 0);
-			uiItemR(col, "X", 0, &ptr, "size_x", 0);
-			uiItemR(col, "Y", 0, &ptr, "size_y", 0);
-			uiItemR(col, "Z", 0, &ptr, "size_z", 0);
+			uiItemR(col, &ptr, "size_x", 0, "X", 0);
+			uiItemR(col, &ptr, "size_y", 0, "Y", 0);
+			uiItemR(col, &ptr, "size_z", 0, "Z", 0);
 			break;
 		case MB_TUBE:
 			uiItemL(col, "Size:", 0);
-			uiItemR(col, "X", 0, &ptr, "size_x", 0);
+			uiItemR(col, &ptr, "size_x", 0, "X", 0);
 			break;
 		case MB_PLANE:
 			uiItemL(col, "Size:", 0);
-			uiItemR(col, "X", 0, &ptr, "size_x", 0);
-			uiItemR(col, "Y", 0, &ptr, "size_y", 0);
+			uiItemR(col, &ptr, "size_x", 0, "X", 0);
+			uiItemR(col, &ptr, "size_y", 0, "Y", 0);
 			break;
 		case MB_ELIPSOID:
 			uiItemL(col, "Size:", 0);
-			uiItemR(col, "X", 0, &ptr, "size_x", 0);
-			uiItemR(col, "Y", 0, &ptr, "size_y", 0);
-			uiItemR(col, "Z", 0, &ptr, "size_z", 0);
+			uiItemR(col, &ptr, "size_x", 0, "X", 0);
+			uiItemR(col, &ptr, "size_y", 0, "Y", 0);
+			uiItemR(col, &ptr, "size_z", 0, "Z", 0);
 			break;		   
 	}	
 }
diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c
index 76e076b05bd..558e817157f 100644
--- a/source/blender/editors/space_view3d/view3d_header.c
+++ b/source/blender/editors/space_view3d/view3d_header.c
@@ -466,7 +466,7 @@ void uiTemplateHeader3D(uiLayout *layout, struct bContext *C)
 	uiBlockEndAlign(block);
 	
 	/* Draw type */
-	uiItemR(layout, "", 0, &v3dptr, "viewport_shading", UI_ITEM_R_ICON_ONLY);
+	uiItemR(layout, &v3dptr, "viewport_shading", UI_ITEM_R_ICON_ONLY, "", 0);
 
 	if (obedit==NULL && ((ob && ob->mode & (OB_MODE_VERTEX_PAINT|OB_MODE_WEIGHT_PAINT|OB_MODE_TEXTURE_PAINT)))) {
 		/* Manipulators aren't used in weight paint mode */
@@ -474,13 +474,13 @@ void uiTemplateHeader3D(uiLayout *layout, struct bContext *C)
 		PointerRNA meshptr;
 
 		RNA_pointer_create(&ob->id, &RNA_Mesh, ob->data, &meshptr);
-		uiItemR(layout, "", 0, &meshptr, "use_paint_mask", UI_ITEM_R_ICON_ONLY);
+		uiItemR(layout, &meshptr, "use_paint_mask", UI_ITEM_R_ICON_ONLY, "", 0);
 	} else {
 		char *str_menu;
 
 		row= uiLayoutRow(layout, 1);
-		uiItemR(row, "", 0, &v3dptr, "pivot_point", UI_ITEM_R_ICON_ONLY);
-		uiItemR(row, "", 0, &v3dptr, "pivot_point_align", UI_ITEM_R_ICON_ONLY);
+		uiItemR(row, &v3dptr, "pivot_point", UI_ITEM_R_ICON_ONLY, "", 0);
+		uiItemR(row, &v3dptr, "pivot_point_align", UI_ITEM_R_ICON_ONLY, "", 0);
 
 		/* NDOF */
 		/* Not implemented yet
@@ -495,7 +495,7 @@ void uiTemplateHeader3D(uiLayout *layout, struct bContext *C)
 
 		/* Transform widget / manipulators */
 		row= uiLayoutRow(layout, 1);
-		uiItemR(row, "", 0, &v3dptr, "manipulator", UI_ITEM_R_ICON_ONLY);
+		uiItemR(row, &v3dptr, "manipulator", UI_ITEM_R_ICON_ONLY, "", 0);
 		block= uiLayoutGetBlock(row);
 		
 		if(v3d->twflag & V3D_USE_MANIPULATOR) {
@@ -523,7 +523,7 @@ void uiTemplateHeader3D(uiLayout *layout, struct bContext *C)
 			uiTemplateLayers(layout, &v3dptr, "visible_layers", &v3dptr, "used_layers", ob_lay);
 
 		/* Scene lock */
-		uiItemR(layout, "", 0, &v3dptr, "lock_camera_and_layers", UI_ITEM_R_ICON_ONLY);
+		uiItemR(layout, &v3dptr, "lock_camera_and_layers", UI_ITEM_R_ICON_ONLY, "", 0);
 	}
 	
 	/* selection modus, dont use python for this since it cant do the toggle buttons with shift+click as well as clicking to set one. */
diff --git a/source/blender/makesrna/intern/rna_ui_api.c b/source/blender/makesrna/intern/rna_ui_api.c
index 0b814b38c5b..201f75c9c8c 100644
--- a/source/blender/makesrna/intern/rna_ui_api.c
+++ b/source/blender/makesrna/intern/rna_ui_api.c
@@ -55,7 +55,7 @@ static void rna_uiItemR(uiLayout *layout, PointerRNA *ptr, char *propname, char
 	flag |= (full_event)? UI_ITEM_R_FULL_EVENT: 0;
 	flag |= (no_bg)? UI_ITEM_R_NO_BG: 0;
 
-	uiItemFullR(layout, name, icon, ptr, prop, index, 0, flag);
+	uiItemFullR(layout, ptr, prop, index, 0, flag, name, icon);
 }
 
 static PointerRNA rna_uiItemO(uiLayout *layout, char *opname, char *name, int icon)