[Bf-blender-cvs] [7b530c60961] blender-v3.0-release: Fix: Incorrect assert in dot grid drawing

Hans Goudey noreply at git.blender.org
Tue Nov 9 20:15:41 CET 2021


Commit: 7b530c6096112c9a15db2e637d44012e248f1ab4
Author: Hans Goudey
Date:   Tue Nov 9 13:15:34 2021 -0600
Branches: blender-v3.0-release
https://developer.blender.org/rB7b530c6096112c9a15db2e637d44012e248f1ab4

Fix: Incorrect assert in dot grid drawing

It's totally valid for the grid levels to be zero.

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

M	source/blender/editors/interface/view2d.c

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

diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c
index eea6512f0f8..9a6fbbf4016 100644
--- a/source/blender/editors/interface/view2d.c
+++ b/source/blender/editors/interface/view2d.c
@@ -1348,7 +1348,7 @@ void UI_view2d_dot_grid_draw(const View2D *v2d,
                              const float min_step,
                              const int grid_levels)
 {
-  BLI_assert(grid_levels > 0 && grid_levels < 10);
+  BLI_assert(grid_levels >= 0 && grid_levels < 10);
   const float zoom_x = (float)(BLI_rcti_size_x(&v2d->mask) + 1) / BLI_rctf_size_x(&v2d->cur);
   const float zoom_normalized = (zoom_x - v2d->minzoom) / (v2d->maxzoom - v2d->minzoom);



More information about the Bf-blender-cvs mailing list