diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-02-09 18:26:05 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-02-09 18:26:05 +0300 |
commit | 7e3e542aaba1a4e230b01fd9109471d28a9f9487 (patch) | |
tree | caa5c0edda24f3ba8b958e68e45bb7477c97b090 /source/blender/editors/space_file | |
parent | be4ebb7fa6c4b0678803c75d20c080e0b1db4877 (diff) | |
parent | ea9099473a545ae1992ae0fbc4ba0bf09cff1bd9 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_file')
-rw-r--r-- | source/blender/editors/space_file/space_file.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/editors/space_file/space_file.c b/source/blender/editors/space_file/space_file.c index 3c90f2957df..0fe51ea1c70 100644 --- a/source/blender/editors/space_file/space_file.c +++ b/source/blender/editors/space_file/space_file.c @@ -189,6 +189,9 @@ static SpaceLink *file_duplicate(SpaceLink *sl) /* clear or remove stuff from old */ sfilen->op = NULL; /* file window doesn't own operators */ + sfilen->previews_timer = NULL; + sfilen->smoothscroll_timer = NULL; + if (sfileo->params) { sfilen->files = filelist_new(sfileo->params->type); sfilen->params = MEM_dupallocN(sfileo->params); |