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
path: root/source
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-11-24 14:53:16 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-11-24 15:03:07 +0300
commitf67a685ad9f6565a2c7054d73188bd2f3003a6df (patch)
treea015d4af8fb25513c61a0ee26b906566c01d5464 /source
parent660f0c6a0e1fa9bf8e93e3eb6c31dee9ed919192 (diff)
Cleanup: move console scrollback initialization into versioning
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenloader/intern/versioning_userdef.c3
-rw-r--r--source/blender/editors/space_console/console_ops.c4
2 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/blenloader/intern/versioning_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c
index f20ef8a07b7..ac7fcdd3769 100644
--- a/source/blender/blenloader/intern/versioning_userdef.c
+++ b/source/blender/blenloader/intern/versioning_userdef.c
@@ -674,6 +674,9 @@ void BLO_version_defaults_userpref_blend(Main *bmain, UserDef *userdef)
userdef->view_rotate_sensitivity_turntable = DEG2RADF(0.4f);
userdef->view_rotate_sensitivity_trackball = 1.0f;
}
+ if (userdef->scrollback == 0) {
+ userdef->scrollback = U_default.scrollback;
+ }
/* pass */
}
diff --git a/source/blender/editors/space_console/console_ops.c b/source/blender/editors/space_console/console_ops.c
index 591c3cc62f2..278981d2091 100644
--- a/source/blender/editors/space_console/console_ops.c
+++ b/source/blender/editors/space_console/console_ops.c
@@ -86,10 +86,6 @@ static void console_scrollback_limit(SpaceConsole *sc)
{
int tot;
- if (U.scrollback < 32) {
- U.scrollback = 256; // XXX - save in user defaults
- }
-
for (tot = BLI_listbase_count(&sc->scrollback); tot > U.scrollback; tot--) {
console_scrollback_free(sc, sc->scrollback.first);
}