[Bf-blender-cvs] [6f36296] master: Make limits of sequencer scaling a bit more sane
Antony Riakiotakis
noreply at git.blender.org
Thu Mar 5 19:05:49 CET 2015
Commit: 6f3629607b794c120531475f2f5e79cceafdadf7
Author: Antony Riakiotakis
Date: Thu Mar 5 19:05:39 2015 +0100
Branches: master
https://developer.blender.org/rB6f3629607b794c120531475f2f5e79cceafdadf7
Make limits of sequencer scaling a bit more sane
===================================================================
M source/blender/blenloader/intern/versioning_270.c
M source/blender/editors/space_sequencer/space_sequencer.c
===================================================================
diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c
index 089ee15..ab5c8ac 100644
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -644,6 +644,8 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
for (ar = sl->regionbase.first; ar; ar = ar->next) {
if (ar->regiontype == RGN_TYPE_PREVIEW) {
ar->v2d.keepzoom |= V2D_LIMITZOOM;
+ ar->v2d.minzoom = 0.001f;
+ ar->v2d.maxzoom = 1000.0f;
break;
}
}
diff --git a/source/blender/editors/space_sequencer/space_sequencer.c b/source/blender/editors/space_sequencer/space_sequencer.c
index 8934628..7a7f189 100644
--- a/source/blender/editors/space_sequencer/space_sequencer.c
+++ b/source/blender/editors/space_sequencer/space_sequencer.c
@@ -145,8 +145,8 @@ static SpaceLink *sequencer_new(const bContext *C)
ar->flag |= RGN_FLAG_HIDDEN;
/* for now, aspect ratio should be maintained, and zoom is clamped within sane default limits */
ar->v2d.keepzoom = V2D_KEEPASPECT | V2D_KEEPZOOM | V2D_LIMITZOOM;
- ar->v2d.minzoom = 0.00001f;
- ar->v2d.maxzoom = 100000.0f;
+ ar->v2d.minzoom = 0.001f;
+ ar->v2d.maxzoom = 1000.0f;
ar->v2d.tot.xmin = -960.0f; /* 1920 width centered */
ar->v2d.tot.ymin = -540.0f; /* 1080 height centered */
ar->v2d.tot.xmax = 960.0f;
More information about the Bf-blender-cvs
mailing list