Revision: 27674
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27674
Author: campbellbarton
Date: 2010-03-23 13:42:46 +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).
Modified Paths:
--------------
branches/render25/release/scripts/ui/space_info.py
branches/render25/source/blender/editors/armature/editarmature.c
branches/render25/source/blender/editors/curve/editcurve.c
branches/render25/source/blender/editors/gpencil/gpencil_buttons.c
branches/render25/source/blender/editors/include/UI_interface.h
branches/render25/source/blender/editors/interface/interface_handlers.c
branches/render25/source/blender/editors/interface/interface_layout.c
branches/render25/source/blender/editors/interface/interface_templates.c
branches/render25/source/blender/editors/object/object_relations.c
branches/render25/source/blender/editors/sound/sound_ops.c
branches/render25/source/blender/editors/space_graph/graph_buttons.c
branches/render25/source/blender/editors/space_graph/graph_edit.c
branches/render25/source/blender/editors/space_image/image_header.c
branches/render25/source/blender/editors/space_image/image_ops.c
branches/render25/source/blender/editors/space_nla/nla_edit.c
branches/render25/source/blender/editors/space_node/drawnode.c
branches/render25/source/blender/editors/space_text/text_header.c
branches/render25/source/blender/editors/space_text/text_ops.c
branches/render25/source/blender/editors/space_view3d/view3d_select.c
branches/render25/source/blender/editors/space_view3d/view3d_toolbar.c
branches/render25/source/blender/makesrna/intern/rna_ui_api.c
branches/render25/source/blender/python/intern/bpy_rna.c
branches/render25/source/blender/windowmanager/intern/wm_operators.c
branches/render25/source/blenderplayer/bad_level_call_stubs/stubs.c
Modified: branches/render25/release/scripts/ui/space_info.py
===================================================================
--- branches/render25/release/scripts/ui/space_info.py 2010-03-23 11:59:34 UTC
(rev 27673)
+++ branches/render25/release/scripts/ui/space_info.py 2010-03-23 12:42:46 UTC
(rev 27674)
@@ -221,7 +221,7 @@
layout.operator_menu_enum("object.curve_add", "type", text="Curve",
icon='OUTLINER_OB_CURVE')
layout.operator_menu_enum("object.surface_add", "type",
text="Surface", icon='OUTLINER_OB_SURFACE')
- layout.operator_menu_enum("object.metaball_add", "type", 'META',
text="Metaball", icon='OUTLINER_OB_META')
+ layout.operator_menu_enum("object.metaball_add", "type",
text="Metaball", icon='OUTLINER_OB_META')
layout.operator("object.text_add", text="Text",
icon='OUTLINER_OB_FONT')
layout.separator()
@@ -233,10 +233,10 @@
layout.operator("object.camera_add", text="Camera",
icon='OUTLINER_OB_CAMERA')
layout.operator_context = 'EXEC_SCREEN'
- layout.operator_menu_enum("object.lamp_add", "type", 'LAMP',
text="Lamp", icon='OUTLINER_OB_LAMP')
+ layout.operator_menu_enum("object.lamp_add", "type", text="Lamp",
icon='OUTLINER_OB_LAMP')
layout.separator()
- layout.operator_menu_enum("object.effector_add", "type", 'EMPTY',
text="Force Field", icon='OUTLINER_OB_EMPTY')
+ layout.operator_menu_enum("object.effector_add", "type", text="Force
Field", icon='OUTLINER_OB_EMPTY')
layout.separator()
if(len(bpy.data.groups) > 10):
Modified: branches/render25/source/blender/editors/armature/editarmature.c
===================================================================
--- branches/render25/source/blender/editors/armature/editarmature.c
2010-03-23 11:59:34 UTC (rev 27673)
+++ branches/render25/source/blender/editors/armature/editarmature.c
2010-03-23 12:42:46 UTC (rev 27674)
@@ -3958,11 +3958,11 @@
}
CTX_DATA_END;
- uiItemEnumO(layout, NULL, 0, "ARMATURE_OT_parent_set", "type",
ARM_PAR_CONNECT);
+ uiItemEnumO(layout, "ARMATURE_OT_parent_set", NULL, 0, "type",
ARM_PAR_CONNECT);
/* ob becomes parent, make the associated menus */
if (allchildbones)
- uiItemEnumO(layout, NULL, 0, "ARMATURE_OT_parent_set", "type",
ARM_PAR_OFFSET);
+ uiItemEnumO(layout, "ARMATURE_OT_parent_set", NULL, 0, "type",
ARM_PAR_OFFSET);
uiPupMenuEnd(C, pup);
Modified: branches/render25/source/blender/editors/curve/editcurve.c
===================================================================
--- branches/render25/source/blender/editors/curve/editcurve.c 2010-03-23
11:59:34 UTC (rev 27673)
+++ branches/render25/source/blender/editors/curve/editcurve.c 2010-03-23
12:42:46 UTC (rev 27674)
@@ -4573,8 +4573,8 @@
if(obedit->type==OB_SURF) {
pup= uiPupMenuBegin(C, "Delete", 0);
layout= uiPupMenuLayout(pup);
- uiItemEnumO(layout, NULL, 0, op->type->idname, "type", 0);
- uiItemEnumO(layout, NULL, 0, op->type->idname, "type", 2);
+ uiItemEnumO(layout, op->type->idname, NULL, 0, "type", 0);
+ uiItemEnumO(layout, op->type->idname, NULL, 0, "type", 2);
uiPupMenuEnd(C, pup);
}
else {
Modified: branches/render25/source/blender/editors/gpencil/gpencil_buttons.c
===================================================================
--- branches/render25/source/blender/editors/gpencil/gpencil_buttons.c
2010-03-23 11:59:34 UTC (rev 27673)
+++ branches/render25/source/blender/editors/gpencil/gpencil_buttons.c
2010-03-23 12:42:46 UTC (rev 27674)
@@ -264,11 +264,11 @@
/* 'stick to view' option */
row= uiLayoutRow(col, 1);
- uiItemEnumR_string(row, NULL, 0, &gpd_ptr, "draw_mode", "VIEW");
- uiItemEnumR_string(row, NULL, 0, &gpd_ptr, "draw_mode",
"CURSOR");
+ uiItemEnumR_string(row, &gpd_ptr, "draw_mode", "VIEW", NULL, 0);
+ uiItemEnumR_string(row, &gpd_ptr, "draw_mode", "CURSOR", NULL,
0);
row= uiLayoutRow(col, 1);
- uiItemEnumR_string(row, NULL, 0, &gpd_ptr, "draw_mode",
"SURFACE");
- uiItemEnumR_string(row, NULL, 0, &gpd_ptr, "draw_mode",
"STROKE");
+ uiItemEnumR_string(row, &gpd_ptr, "draw_mode", "SURFACE", NULL,
0);
+ uiItemEnumR_string(row, &gpd_ptr, "draw_mode", "STROKE", NULL,
0);
row= uiLayoutRow(col, 0);
uiLayoutSetActive(row, (gpd->flag &
(GP_DATA_DEPTH_STROKE|GP_DATA_DEPTH_VIEW)) ? 1:0);
Modified: branches/render25/source/blender/editors/include/UI_interface.h
===================================================================
--- branches/render25/source/blender/editors/include/UI_interface.h
2010-03-23 11:59:34 UTC (rev 27673)
+++ branches/render25/source/blender/editors/include/UI_interface.h
2010-03-23 12:42:46 UTC (rev 27674)
@@ -693,32 +693,32 @@
/* items */
void uiItemO(uiLayout *layout, char *name, int icon, char *opname);
-void uiItemEnumO(uiLayout *layout, char *name, int icon, char *opname, char
*propname, int value);
+void uiItemEnumO(uiLayout *layout, char *opname, char *name, int icon, char
*propname, int value);
void uiItemEnumO_string(uiLayout *layout, char *name, int icon, char *opname,
char *propname, char *value);
void uiItemsEnumO(uiLayout *layout, char *opname, char *propname);
void uiItemBooleanO(uiLayout *layout, char *name, int icon, char *opname, char
*propname, int value);
void uiItemIntO(uiLayout *layout, char *name, int icon, char *opname, char
*propname, int value);
void uiItemFloatO(uiLayout *layout, char *name, int icon, char *opname, char
*propname, float value);
void uiItemStringO(uiLayout *layout, char *name, int icon, char *opname, char
*propname, char *value);
-PointerRNA uiItemFullO(uiLayout *layout, char *name, int icon, char *idname,
struct IDProperty *properties, int context, int flag);
+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 uiItemEnumR(uiLayout *layout, char *name, int icon, struct PointerRNA
*ptr, char *propname, int value);
-void uiItemEnumR_string(uiLayout *layout, char *name, int icon, struct
PointerRNA *ptr, char *propname, char *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);
-void uiItemPointerR(uiLayout *layout, char *name, int icon, struct PointerRNA
*ptr, char *propname, struct PointerRNA *searchptr, char *searchpropname);
+void uiItemPointerR(uiLayout *layout, struct PointerRNA *ptr, char *propname,
struct PointerRNA *searchptr, char *searchpropname, char *name, int icon);
void uiItemsFullEnumO(uiLayout *layout, char *opname, char *propname, struct
IDProperty *properties, int context, int flag);
void uiItemL(uiLayout *layout, char *name, int icon); /* label */
void uiItemLDrag(uiLayout *layout, struct PointerRNA *ptr, char *name, int
icon); /* label icon for dragging */
-void uiItemM(uiLayout *layout, struct bContext *C, char *name, int icon, char
*menuname); /* menu */
+void uiItemM(uiLayout *layout, struct bContext *C, char *menuname, char *name,
int icon); /* menu */
void uiItemV(uiLayout *layout, char *name, int icon, int argval); /* value */
void uiItemS(uiLayout *layout); /* separator */
void uiItemMenuF(uiLayout *layout, char *name, int icon, uiMenuCreateFunc
func, void *arg);
-void uiItemMenuEnumO(uiLayout *layout, char *name, int icon, char *opname,
char *propname);
-void uiItemMenuEnumR(uiLayout *layout, char *name, int icon, struct PointerRNA
*ptr, char *propname);
+void uiItemMenuEnumO(uiLayout *layout, char *opname, char *propname, char
*name, int icon);
+void uiItemMenuEnumR(uiLayout *layout, struct PointerRNA *ptr, char *propname,
char *name, int icon);
/* UI Operators */
void UI_buttons_operatortypes(void);
Modified:
branches/render25/source/blender/editors/interface/interface_handlers.c
===================================================================
--- branches/render25/source/blender/editors/interface/interface_handlers.c
2010-03-23 11:59:34 UTC (rev 27673)
+++ branches/render25/source/blender/editors/interface/interface_handlers.c
2010-03-23 12:42:46 UTC (rev 27674)
@@ -3953,28 +3953,28 @@
WM_operator_properties_create(&ptr_props,
"WM_OT_doc_view");
RNA_string_set(&ptr_props, "doc_id", buf);
- uiItemFullO(layout, "View Docs", 0, "WM_OT_doc_view",
ptr_props.data, WM_OP_EXEC_DEFAULT, 0);
+ uiItemFullO(layout, "WM_OT_doc_view", "View Docs", 0,
ptr_props.data, WM_OP_EXEC_DEFAULT, 0);
WM_operator_properties_create(&ptr_props,
"WM_OT_doc_edit");
RNA_string_set(&ptr_props, "doc_id", buf);
RNA_string_set(&ptr_props, "doc_new",
RNA_property_description(but->rnaprop));
- uiItemFullO(layout, "Submit Description", 0,
"WM_OT_doc_edit", ptr_props.data, WM_OP_INVOKE_DEFAULT, 0);
+ uiItemFullO(layout, "WM_OT_doc_edit", "Submit
Description", 0, ptr_props.data, WM_OP_INVOKE_DEFAULT, 0);
}
else if (but->optype) {
WM_operator_py_idname(buf, but->optype->idname);
WM_operator_properties_create(&ptr_props,
"WM_OT_doc_view");
RNA_string_set(&ptr_props, "doc_id", buf);
- uiItemFullO(layout, "View Docs", 0, "WM_OT_doc_view",
ptr_props.data, WM_OP_EXEC_DEFAULT, 0);
+ uiItemFullO(layout, "WM_OT_doc_view", "View Docs", 0,
ptr_props.data, WM_OP_EXEC_DEFAULT, 0);
WM_operator_properties_create(&ptr_props,
"WM_OT_doc_edit");
RNA_string_set(&ptr_props, "doc_id", buf);
RNA_string_set(&ptr_props, "doc_new",
but->optype->description);
- uiItemFullO(layout, "Submit Description", 0,
"WM_OT_doc_edit", ptr_props.data, WM_OP_INVOKE_DEFAULT, 0);
+ uiItemFullO(layout, "WM_OT_doc_edit", "Submit
Description", 0, ptr_props.data, WM_OP_INVOKE_DEFAULT, 0);
}
}
Modified: branches/render25/source/blender/editors/interface/interface_layout.c
===================================================================
--- branches/render25/source/blender/editors/interface/interface_layout.c
2010-03-23 11:59:34 UTC (rev 27673)
+++ branches/render25/source/blender/editors/interface/interface_layout.c
2010-03-23 12:42:46 UTC (rev 27674)
@@ -600,7 +600,7 @@
}
/* operator items */
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
