diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-04-04 17:37:07 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-04-04 17:37:07 +0400 |
| commit | 83fff218cca47147183c1177de9db1381cfa48e6 (patch) | |
| tree | 2576a9f8c61393a346c53eb85077ede1ba2b1d33 /source/blender/editors/space_file | |
| parent | 69035e183ba91877489e8aae2d0425b13813ac18 (diff) | |
| parent | 19dd08a4828ac1883138b2a65f0b8df1498e0d15 (diff) | |
svn merge ^/trunk/blender -r55700:55776
Diffstat (limited to 'source/blender/editors/space_file')
| -rw-r--r-- | source/blender/editors/space_file/file_draw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_file/file_draw.c b/source/blender/editors/space_file/file_draw.c index 1c677d7c006..4a0665d663e 100644 --- a/source/blender/editors/space_file/file_draw.c +++ b/source/blender/editors/space_file/file_draw.c @@ -376,7 +376,7 @@ static void file_draw_preview(uiBlock *block, struct direntry *file, int sx, int /* the image */ glColor4f(1.0, 1.0, 1.0, 1.0); - glaDrawPixelsTexScaled((float)xco, (float)yco, imb->x, imb->y, GL_UNSIGNED_BYTE, GL_NEAREST, imb->rect, scale, scale); + glaDrawPixelsTexScaled((float)xco, (float)yco, imb->x, imb->y, GL_RGBA, GL_UNSIGNED_BYTE, GL_NEAREST, imb->rect, scale, scale); /* border */ if (dropshadow) { @@ -538,7 +538,7 @@ void file_draw_list(const bContext *C, ARegion *ar) uiButSetRenameFunc(but, renamebutton_cb, file); uiButSetFlag(but, UI_BUT_NO_UTF8); /* allow non utf8 names */ uiButClearFlag(but, UI_BUT_UNDO); - if (0 == uiButActiveOnly(C, ar, block, but)) { + if (false == uiButActiveOnly(C, ar, block, but)) { file->selflag &= ~EDITING_FILE; } } |