diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-12-27 04:38:23 +0300 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-12-27 04:38:23 +0300 |
commit | 3ead3c4ff3a438202a9838843ed4000b26de62a7 (patch) | |
tree | 868c64cfcf2a5358a181f2cb88d8a534436ab9bd /source/blender/editors/space_nla/nla_buttons.c | |
parent | 2d1bc90eedf933820bcff744706fd16a80d1d1cb (diff) | |
parent | c4a56fda6d64faa3de7d99b29843c8affb6d5156 (diff) |
Merged changes in the trunk up to revision 33894.
A note for branch users: CMake 2.8 on 64-bit Windows Vista raised
an error in line 948 of soc-2008-mxcurioni/CMakeLists.txt due to
an invalid argument for the blender_include_dirs macro:
blender_include_dirs(${OPENGL_INCLUDE_DIR})
The command above should be:
blender_include_dirs("${OPENGL_INCLUDE_DIR}")
Diffstat (limited to 'source/blender/editors/space_nla/nla_buttons.c')
-rw-r--r-- | source/blender/editors/space_nla/nla_buttons.c | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/source/blender/editors/space_nla/nla_buttons.c b/source/blender/editors/space_nla/nla_buttons.c index 5d5b6660d00..8d5b981df1a 100644 --- a/source/blender/editors/space_nla/nla_buttons.c +++ b/source/blender/editors/space_nla/nla_buttons.c @@ -231,15 +231,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 */ @@ -280,40 +280,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); } @@ -340,17 +340,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 */ @@ -369,22 +369,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 */ |