[Bf-blender-cvs] [ff213c802c9] asset-browser-grid-view: Fix failing assert when splitting new asset browser in 2

Julian Eisel noreply at git.blender.org
Wed Feb 9 19:42:58 CET 2022


Commit: ff213c802c9390cedca6ce97ff4268a22be8f181
Author: Julian Eisel
Date:   Wed Feb 9 19:35:07 2022 +0100
Branches: asset-browser-grid-view
https://developer.blender.org/rBff213c802c9390cedca6ce97ff4268a22be8f181

Fix failing assert when splitting new asset browser in 2

This is an issue in master already, but for many layouts it just isn't
triggered. Pretty sure the assert just shouldn't be executed in extreme
cases, where there is no width for the layout and max-sizes become < 0.

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

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

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

diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index 0df81e06721..f9bbfc74cd8 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -1628,9 +1628,9 @@ float UI_text_clip_middle_ex(const uiFontStyle *fstyle,
     }
 
     strwidth = BLF_width(fstyle->uifont_id, str, max_len);
-  }
 
-  BLI_assert(strwidth <= okwidth);
+    BLI_assert(strwidth <= okwidth);
+  }
 
   return strwidth;
 }



More information about the Bf-blender-cvs mailing list