Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Fri, 9 Feb 2018 15:26:05 +0000 (16:26 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Fri, 9 Feb 2018 15:26:05 +0000 (16:26 +0100)
source/blender/editors/space_file/space_file.c

index 3c90f2957df203c8ecb13cbf079b05b192a39ee1..0fe51ea1c70c59c03310e752a283dcd010a677ae 100644 (file)
@@ -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);