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:
authorMartin Poirier <theeth@yahoo.com>2005-07-27 11:50:28 +0400
committerMartin Poirier <theeth@yahoo.com>2005-07-27 11:50:28 +0400
commit21e59fd927dbfdebf2732f43621fb251a1650f60 (patch)
tree8a3ddd66286940c16d405dd7370dcf65098b6dcb /source/blender
parent2e73199ea7ea06a4fbcf83ddf44a410c23bff5de (diff)
Correct init_userdef_file to not overwrite CollectRate and Image TimeOut every time it loads.
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/src/usiblender.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/src/usiblender.c b/source/blender/src/usiblender.c
index eca8da9d26a..ed4103f94bb 100644
--- a/source/blender/src/usiblender.c
+++ b/source/blender/src/usiblender.c
@@ -240,8 +240,10 @@ static void init_userdef_file(void)
if (U.undosteps==0) U.undosteps=32;
/* GL Texture Garbage Collection (variable abused above!) */
- U.texcollectrate = 60;
- U.textimeout = 120;
+ if (U.textimeout == 0) {
+ U.texcollectrate = 60;
+ U.textimeout = 120;
+ }
reset_autosave();