diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-12-23 05:43:40 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-12-23 05:43:40 +0300 |
commit | 86b89af5ddaede7bedf6a98f20e0b4f92e5796b2 (patch) | |
tree | 6b193ba8709baf5b26bf538a81eb2aabf3337789 /source/blender/editors/space_nla | |
parent | f0951e86ee2807e4635d96b1debbcca0c3108920 (diff) |
use ICON_NULL define rather then 0, makes UI calls less confusing. (no functional change)
eg: uiItemR(row, &dvar_ptr, "type", 0, "", 0); -> uiItemR(row, &dvar_ptr, "type", 0, "", ICON_NULL);
Diffstat (limited to 'source/blender/editors/space_nla')
-rw-r--r-- | source/blender/editors/space_nla/nla_buttons.c | 54 | ||||
-rw-r--r-- | source/blender/editors/space_nla/nla_edit.c | 2 |
2 files changed, 28 insertions, 28 deletions
diff --git a/source/blender/editors/space_nla/nla_buttons.c b/source/blender/editors/space_nla/nla_buttons.c index 957bf001417..baab6ab353a 100644 --- a/source/blender/editors/space_nla/nla_buttons.c +++ b/source/blender/editors/space_nla/nla_buttons.c @@ -230,15 +230,15 @@ static void nla_panel_animdata (const bContext *C, Panel *pa) /* extrapolation */ row= uiLayoutRow(layout, 1); - uiItemR(row, &adt_ptr, "action_extrapolation", 0, NULL, 0); + uiItemR(row, &adt_ptr, "action_extrapolation", 0, NULL, ICON_NULL); /* blending */ row= uiLayoutRow(layout, 1); - uiItemR(row, &adt_ptr, "action_blend_type", 0, NULL, 0); + uiItemR(row, &adt_ptr, "action_blend_type", 0, NULL, ICON_NULL); /* influence */ row= uiLayoutRow(layout, 1); - uiItemR(row, &adt_ptr, "action_influence", 0, NULL, 0); + uiItemR(row, &adt_ptr, "action_influence", 0, NULL, ICON_NULL); } /* active NLA-Track */ @@ -279,40 +279,40 @@ static void nla_panel_properties(const bContext *C, Panel *pa) /* strip type */ row= uiLayoutColumn(layout, 1); uiItemR(row, &strip_ptr, "name", 0, NULL, ICON_NLA); // XXX icon? - uiItemR(row, &strip_ptr, "type", 0, NULL, 0); + uiItemR(row, &strip_ptr, "type", 0, NULL, ICON_NULL); /* strip extents */ column= uiLayoutColumn(layout, 1); - uiItemL(column, "Strip Extents:", 0); - uiItemR(column, &strip_ptr, "frame_start", 0, NULL, 0); - uiItemR(column, &strip_ptr, "frame_end", 0, NULL, 0); + uiItemL(column, "Strip Extents:", ICON_NULL); + uiItemR(column, &strip_ptr, "frame_start", 0, NULL, ICON_NULL); + uiItemR(column, &strip_ptr, "frame_end", 0, NULL, ICON_NULL); /* extrapolation */ row= uiLayoutRow(layout, 1); - uiItemR(row, &strip_ptr, "extrapolation", 0, NULL, 0); + uiItemR(row, &strip_ptr, "extrapolation", 0, NULL, ICON_NULL); /* blending */ row= uiLayoutRow(layout, 1); - uiItemR(row, &strip_ptr, "blend_type", 0, NULL, 0); + uiItemR(row, &strip_ptr, "blend_type", 0, NULL, ICON_NULL); /* 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, "use_animated_influence")==0); - uiItemR(column, &strip_ptr, "use_auto_blend", 0, NULL, 0); // XXX as toggle? + uiItemR(column, &strip_ptr, "use_auto_blend", 0, NULL, ICON_NULL); // XXX as toggle? subcol= uiLayoutColumn(column, 1); uiLayoutSetActive(subcol, RNA_boolean_get(&strip_ptr, "use_auto_blend")==0); - uiItemR(subcol, &strip_ptr, "blend_in", 0, NULL, 0); - uiItemR(subcol, &strip_ptr, "blend_out", 0, NULL, 0); + uiItemR(subcol, &strip_ptr, "blend_in", 0, NULL, ICON_NULL); + uiItemR(subcol, &strip_ptr, "blend_out", 0, NULL, ICON_NULL); /* settings */ column= uiLayoutColumn(layout, 1); uiLayoutSetActive(column, !(RNA_boolean_get(&strip_ptr, "use_animated_influence") || RNA_boolean_get(&strip_ptr, "use_animated_time"))); - uiItemL(column, "Playback Settings:", 0); - uiItemR(column, &strip_ptr, "mute", 0, NULL, 0); - uiItemR(column, &strip_ptr, "use_reverse", 0, NULL, 0); + uiItemL(column, "Playback Settings:", ICON_NULL); + uiItemR(column, &strip_ptr, "mute", 0, NULL, ICON_NULL); + uiItemR(column, &strip_ptr, "use_reverse", 0, NULL, ICON_NULL); } @@ -339,17 +339,17 @@ static void nla_panel_actclip(const bContext *C, Panel *pa) /* 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, &strip_ptr, "action_frame_start", 0, "Start Frame", 0); - uiItemR(column, &strip_ptr, "action_frame_end", 0, "End Frame", 0); - uiItemO(column, NULL, 0, "NLA_OT_action_sync_length"); + uiItemL(column, "Action Extents:", ICON_NULL); + uiItemR(column, &strip_ptr, "action_frame_start", 0, "Start Frame", ICON_NULL); + uiItemR(column, &strip_ptr, "action_frame_end", 0, "End Frame", ICON_NULL); + uiItemO(column, NULL, ICON_NULL, "NLA_OT_action_sync_length"); /* action usage */ column= uiLayoutColumn(layout, 1); uiLayoutSetActive(column, RNA_boolean_get(&strip_ptr, "use_animated_time")==0); - uiItemL(column, "Playback Settings:", 0); - uiItemR(column, &strip_ptr, "scale", 0, NULL, 0); - uiItemR(column, &strip_ptr, "repeat", 0, NULL, 0); + uiItemL(column, "Playback Settings:", ICON_NULL); + uiItemR(column, &strip_ptr, "scale", 0, NULL, ICON_NULL); + uiItemR(column, &strip_ptr, "repeat", 0, NULL, ICON_NULL); } /* evaluation settings for active NLA-Strip */ @@ -368,22 +368,22 @@ static void nla_panel_evaluation(const bContext *C, Panel *pa) uiBlockSetHandleFunc(block, do_nla_region_buttons, NULL); column= uiLayoutColumn(layout, 1); - uiItemR(column, &strip_ptr, "use_animated_influence", 0, NULL, 0); + uiItemR(column, &strip_ptr, "use_animated_influence", 0, NULL, ICON_NULL); subcolumn= uiLayoutColumn(column, 1); uiLayoutSetEnabled(subcolumn, RNA_boolean_get(&strip_ptr, "use_animated_influence")); - uiItemR(subcolumn, &strip_ptr, "influence", 0, NULL, 0); + uiItemR(subcolumn, &strip_ptr, "influence", 0, NULL, ICON_NULL); column= uiLayoutColumn(layout, 1); subrow= uiLayoutRow(column, 0); - uiItemR(subrow, &strip_ptr, "use_animated_time", 0, NULL, 0); - uiItemR(subrow, &strip_ptr, "use_animated_time_cyclic", 0, NULL, 0); + uiItemR(subrow, &strip_ptr, "use_animated_time", 0, NULL, ICON_NULL); + uiItemR(subrow, &strip_ptr, "use_animated_time_cyclic", 0, NULL, ICON_NULL); subcolumn= uiLayoutColumn(column, 1); subrow= uiLayoutRow(subcolumn, 0); uiLayoutSetEnabled(subrow, RNA_boolean_get(&strip_ptr, "use_animated_time")); - uiItemR(subcolumn, &strip_ptr, "strip_time", 0, NULL, 0); + uiItemR(subcolumn, &strip_ptr, "strip_time", 0, NULL, ICON_NULL); } /* F-Modifiers for active NLA-Strip */ diff --git a/source/blender/editors/space_nla/nla_edit.c b/source/blender/editors/space_nla/nla_edit.c index 279c8c59c28..e04ef99e6fe 100644 --- a/source/blender/editors/space_nla/nla_edit.c +++ b/source/blender/editors/space_nla/nla_edit.c @@ -1549,7 +1549,7 @@ static int nla_fmodifier_add_invoke (bContext *C, wmOperator *UNUSED(op), wmEven uiLayout *layout; int i; - pup= uiPupMenuBegin(C, "Add F-Modifier", 0); + pup= uiPupMenuBegin(C, "Add F-Modifier", ICON_NULL); layout= uiPupMenuLayout(pup); /* start from 1 to skip the 'Invalid' modifier type */ |