diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-12-04 21:26:35 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-12-04 21:26:35 +0400 |
| commit | 756ac13e3a17e1820c5151f1fff8cb21833a1f0f (patch) | |
| tree | e6a706fe334a90397109c479acc667781c24a075 /source/blender/editors/interface | |
| parent | 17493c77f4f876910436648f18c0125d20f24809 (diff) | |
| parent | 3eaf5e93fd6625fdcca7fd81e6d5ff202ef8b726 (diff) | |
Merging r42394 through r42412 form trunk into soc-2011-tomato
Diffstat (limited to 'source/blender/editors/interface')
| -rw-r--r-- | source/blender/editors/interface/interface_templates.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index eb7e06623f7..7f01d4f031d 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -1223,7 +1223,7 @@ void uiTemplatePreview(uiLayout *layout, ID *id, int show_buttons, ID *parent, M uiDefButS(block, ROW, B_MATPRV, IFACE_("World"), 0, 0,UI_UNIT_X*10,UI_UNIT_Y, pr_texture, 10, TEX_PR_OTHER, 0, 0, ""); uiDefButS(block, ROW, B_MATPRV, IFACE_("Both"), 0, 0,UI_UNIT_X*10,UI_UNIT_Y, pr_texture, 10, TEX_PR_BOTH, 0, 0, ""); - /* Alpha buton for texture preview */ + /* Alpha button for texture preview */ if(*pr_texture!=TEX_PR_OTHER) { row = uiLayoutRow(layout, 0); uiItemR(row, &texture_ptr, "use_preview_alpha", 0, NULL, ICON_NONE); |