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:
authorCampbell Barton <ideasman42@gmail.com>2016-01-08 21:42:37 +0300
committerCampbell Barton <ideasman42@gmail.com>2016-01-08 22:01:34 +0300
commit2d973f44e2fd47fa2fd4c1f59247c56517fcb26c (patch)
tree33322335805abc0784b4c9d8a0e78fbce0595bac /source/blender/blenloader
parent2835a151c8fbe03a1385662a15caf9ba75347722 (diff)
Fix T47047: Toolbars opening at maximum zoom level
There were 2 issues: - toolbars were set initialized in user-defaults so their scroll & zoom level were set. - initializing new 2d views included the scroll width, which scaled the new views zoom level, especially when dragging out.
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r--source/blender/blenloader/intern/versioning_defaults.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c
index e57a2156c8d..7ea26ea781b 100644
--- a/source/blender/blenloader/intern/versioning_defaults.c
+++ b/source/blender/blenloader/intern/versioning_defaults.c
@@ -175,11 +175,10 @@ void BLO_update_defaults_startup_blend(Main *bmain)
/* Remove all stored panels, we want to use defaults (order, open/closed) as defined by UI code here! */
BLI_freelistN(&ar->panels);
- /* simple fix for 3d view properties scrollbar being not set to top */
- if (ar->regiontype == RGN_TYPE_UI) {
- float offset = ar->v2d.tot.ymax - ar->v2d.cur.ymax;
- ar->v2d.cur.ymax += offset;
- ar->v2d.cur.ymin += offset;
+ /* some toolbars have been saved as initialized,
+ * we don't want them to have odd zoom-level or scrolling set, see: T47047 */
+ if (ELEM(ar->regiontype, RGN_TYPE_UI, RGN_TYPE_TOOLS, RGN_TYPE_TOOL_PROPS)) {
+ ar->v2d.flag &= ~V2D_IS_INITIALISED;
}
}
}