[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27687] trunk/blender/source/blender: rna/ py-api fix.

Brecht Van Lommel brecht at blender.org
Tue Mar 23 16:31:20 CET 2010


Revision: 27687
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27687
Author:   blendix
Date:     2010-03-23 16:31:12 +0100 (Tue, 23 Mar 2010)

Log Message:
-----------
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)

Modified Paths:
--------------
    trunk/blender/source/blender/editors/animation/fmodifier_ui.c
    trunk/blender/source/blender/editors/gpencil/gpencil_buttons.c
    trunk/blender/source/blender/editors/include/UI_interface.h
    trunk/blender/source/blender/editors/interface/interface_handlers.c
    trunk/blender/source/blender/editors/interface/interface_layout.c
    trunk/blender/source/blender/editors/interface/interface_regions.c
    trunk/blender/source/blender/editors/interface/interface_templates.c
    trunk/blender/source/blender/editors/interface/interface_utils.c
    trunk/blender/source/blender/editors/space_file/file_panels.c
    trunk/blender/source/blender/editors/space_graph/graph_buttons.c
    trunk/blender/source/blender/editors/space_image/image_buttons.c
    trunk/blender/source/blender/editors/space_nla/nla_buttons.c
    trunk/blender/source/blender/editors/space_node/drawnode.c
    trunk/blender/source/blender/editors/space_node/node_buttons.c
    trunk/blender/source/blender/editors/space_node/node_draw.c
    trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c
    trunk/blender/source/blender/editors/space_view3d/view3d_header.c
    trunk/blender/source/blender/makesrna/intern/rna_ui_api.c
    trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c

Modified: trunk/blender/source/blender/editors/animation/fmodifier_ui.c
===================================================================
--- trunk/blender/source/blender/editors/animation/fmodifier_ui.c	2010-03-23 15:25:33 UTC (rev 27686)
+++ trunk/blender/source/blender/editors/animation/fmodifier_ui.c	2010-03-23 15:31:12 UTC (rev 27687)
@@ -225,14 +225,14 @@
 	
 	/* 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 @@
 	/* 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 @@
 	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 @@
 	/* 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 @@
 		
 		/* 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 @@
 		
 		/* 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 @@
 	
 	/* 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 @@
 		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 @@
 		
 		
 		/* '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);
 		

Modified: trunk/blender/source/blender/editors/gpencil/gpencil_buttons.c
===================================================================
--- trunk/blender/source/blender/editors/gpencil/gpencil_buttons.c	2010-03-23 15:25:33 UTC (rev 27686)
+++ trunk/blender/source/blender/editors/gpencil/gpencil_buttons.c	2010-03-23 15:31:12 UTC (rev 27687)
@@ -122,11 +122,11 @@
 	
 	/* 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 @@
 		
 		/* 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 @@
 	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 @@
 		
 		/* 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 @@
 		
 		/* 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 @@
 		
 		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);
 }	
 
 

Modified: trunk/blender/source/blender/editors/include/UI_interface.h
===================================================================
--- trunk/blender/source/blender/editors/include/UI_interface.h	2010-03-23 15:25:33 UTC (rev 27686)
+++ trunk/blender/source/blender/editors/include/UI_interface.h	2010-03-23 15:31:12 UTC (rev 27687)
@@ -702,8 +702,8 @@
 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);

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list