[Bf-blender-cvs] [27c1b46360c] temp-gpencil-fill: GPencil: Limit zoom level

Antonio Vazquez noreply at git.blender.org
Thu Jan 28 18:26:58 CET 2021


Commit: 27c1b46360c4b3744b7108c74873e6407490f37d
Author: Antonio Vazquez
Date:   Thu Jan 14 22:24:55 2021 +0100
Branches: temp-gpencil-fill
https://developer.blender.org/rB27c1b46360c4b3744b7108c74873e6407490f37d

GPencil: Limit zoom level

===================================================================

M	source/blender/editors/gpencil/gpencil_fill.c

===================================================================

diff --git a/source/blender/editors/gpencil/gpencil_fill.c b/source/blender/editors/gpencil/gpencil_fill.c
index 42ffe88be5a..b2847c9a789 100644
--- a/source/blender/editors/gpencil/gpencil_fill.c
+++ b/source/blender/editors/gpencil/gpencil_fill.c
@@ -1707,7 +1707,7 @@ static void gpencil_zoom_level_set(tGPDfill *tgpf)
   float zoomx = (width > tgpf->region->winx) ? width / (float)tgpf->region->winx : 1.0f;
   float zoomy = (height > tgpf->region->winy) ? height / (float)tgpf->region->winy : 1.0f;
   if ((zoomx != 1.0f) || (zoomy != 1.0f)) {
-    tgpf->zoom = ceil(max_ff(zoomx, zoomy) + 1.5f);
+    tgpf->zoom = min_ff(ceil(max_ff(zoomx, zoomy) + 1.5f), 6.0f);
   }
 }



More information about the Bf-blender-cvs mailing list