diff options
| author | Joshua Leung <aligorith@gmail.com> | 2009-11-23 12:47:56 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2009-11-23 12:47:56 +0300 |
| commit | c6dbbde16bdcfc46eba0c5a6bcd02c8d40c5f964 (patch) | |
| tree | 604d6d8420649b0d9342bcec59ac92441dd0d954 /source/blender/editors/animation/fmodifier_ui.c | |
| parent | 7617736bd1a628d6ea2300378e191c02bb4f5ad0 (diff) | |
Various bugfixes:
* Tweaked the code for operator buttons so that only those operator buttons in the toolbar have their text left-aligned. This is done at layout-block level
* Silenced "file_init" print when opening the file browser
* Disabled animateability of the "active_shape_key_index" for Objects, since this property behaves in a very unpredictable manner, leading to problems with users trying to keyframe shapekey values and ending up keying the list.
* Remove some unnecessary RNA wrapping code
Diffstat (limited to 'source/blender/editors/animation/fmodifier_ui.c')
| -rw-r--r-- | source/blender/editors/animation/fmodifier_ui.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/source/blender/editors/animation/fmodifier_ui.c b/source/blender/editors/animation/fmodifier_ui.c index 35c578d3ea8..b1241bd274c 100644 --- a/source/blender/editors/animation/fmodifier_ui.c +++ b/source/blender/editors/animation/fmodifier_ui.c @@ -331,7 +331,6 @@ static void draw_modifier__noise(uiLayout *layout, ID *id, FModifier *fcm, short static void draw_modifier__sound(const bContext *C, uiLayout *layout, ID *id, FModifier *fcm, short width) { FMod_Sound *data= (FMod_Sound *)fcm->data; - uiLayout *split, *col; PointerRNA ptr; /* init the RNA-pointer */ @@ -348,16 +347,9 @@ static void draw_modifier__sound(const bContext *C, uiLayout *layout, ID *id, FM /* blending mode */ uiItemR(layout, NULL, 0, &ptr, "modification", 0); - /* split into 2 columns */ - split= uiLayoutSplit(layout, 0.5f); - - /* col 1 */ - col= uiLayoutColumn(split, 0); - uiItemR(col, NULL, 0, &ptr, "strength", 0); - - /* col 2 */ - col= uiLayoutColumn(split, 0); - uiItemR(col, NULL, 0, &ptr, "delay", 0); + /* settings */ + uiItemR(layout, NULL, 0, &ptr, "strength", 0); + uiItemR(layout, NULL, 0, &ptr, "delay", 0); } else { |