Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2010-03-23 18:31:12 +0300
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2010-03-23 18:31:12 +0300
commitf46cccedf62bc30a8ce68d7e48fa011dd37491f7 (patch)
treead2044d2f016f528e128caf9f4f882c744899c95 /source/blender/editors/space_graph/graph_buttons.c
parentcb6d2685bd9cc092ef5e1c9bea10bb3a1577d288 (diff)
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)
Diffstat (limited to 'source/blender/editors/space_graph/graph_buttons.c')
-rw-r--r--source/blender/editors/space_graph/graph_buttons.c32
1 files changed, 16 insertions, 16 deletions
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);