Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Eisel <julian@blender.org>2020-08-05 22:58:03 +0300
committerJulian Eisel <julian@blender.org>2020-08-05 22:58:03 +0300
commit492235903d2fe556074cf179bfa858ec1ae98ed9 (patch)
tree4f63789d37c7a188acaab1b1a5ce344a746b45f3 /source/blender/editors/space_file
parentf41eb8b2a9d2e46b67e90ea4a025876709611391 (diff)
parent315ae005c3e99541e7440ff57a2f624bf0461d6a (diff)
Merge branch 'blender-v2.90-release'
Diffstat (limited to 'source/blender/editors/space_file')
-rw-r--r--source/blender/editors/space_file/file_draw.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/space_file/file_draw.c b/source/blender/editors/space_file/file_draw.c
index 68e9f76abc5..083d41747b3 100644
--- a/source/blender/editors/space_file/file_draw.c
+++ b/source/blender/editors/space_file/file_draw.c
@@ -875,7 +875,9 @@ void file_draw_list(const bContext *C, ARegion *region)
sfile->files, file, FILE_SEL_REMOVE, FILE_SEL_EDITING, CHECK_ALL);
}
}
- else {
+
+ /* file_selflag might have been modified by branch above. */
+ if ((file_selflag & FILE_SEL_EDITING) == 0) {
const int txpos = (params->display == FILE_IMGDISPLAY) ? sx : sx + 1 + icon_ofs;
const int typos = (params->display == FILE_IMGDISPLAY) ?
sy - layout->tile_h + layout->textheight :