[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33339] trunk/blender/source/blender: fix building blenderplayer and a divide by zero bug with the console view.

[Campbell Barton]

Revision: 33339
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33339
Author:   campbellbarton
Date:     2010-11-26 18:07:31 +0100 (Fri, 26 Nov 2010)

Log Message:
-----------
fix building blenderplayer and a divide by zero bug with the console view.

Modified Paths:
--------------
    trunk/blender/source/blender/blenfont/intern/blf.c
    trunk/blender/source/blender/editors/interface/interface_style.c
    trunk/blender/source/blender/editors/space_info/textview.c

Modified: trunk/blender/source/blender/blenfont/intern/blf.c
===================================================================
--- trunk/blender/source/blender/blenfont/intern/blf.c	2010-11-26 17:02:00 UTC (rev 33338)
+++ trunk/blender/source/blender/blenfont/intern/blf.c	2010-11-26 17:07:31 UTC (rev 33339)
@@ -66,6 +66,10 @@
 int global_font_points= 11;
 int global_font_dpi= 72;
 
+// XXX, should these be made into global_font_'s too?
+int blf_mono_font= -1;
+int blf_mono_font_render= -1;
+
 static FontBLF *BLF_get(int fontid)
 {
 	if (fontid >= 0 && fontid < BLF_MAX_FONT)

Modified: trunk/blender/source/blender/editors/interface/interface_style.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_style.c	2010-11-26 17:02:00 UTC (rev 33338)
+++ trunk/blender/source/blender/editors/interface/interface_style.c	2010-11-26 17:07:31 UTC (rev 33339)
@@ -264,9 +264,6 @@
 		BLF_disable(style->widget.uifont_id, BLF_KERNING_DEFAULT);
 }
 
-int blf_mono_font= -1;
-int blf_mono_font_render= -1;
-
 /* ************** init exit ************************ */
 
 /* called on each startup.blend read */

Modified: trunk/blender/source/blender/editors/space_info/textview.c
===================================================================
--- trunk/blender/source/blender/editors/space_info/textview.c	2010-11-26 17:02:00 UTC (rev 33338)
+++ trunk/blender/source/blender/editors/space_info/textview.c	2010-11-26 17:07:31 UTC (rev 33339)
@@ -238,6 +238,7 @@
 	assert(cdc.cwidth > 0);
 	cdc.lheight= tvc->lheight;
 	cdc.console_width= (tvc->winx - (CONSOLE_DRAW_SCROLL + CONSOLE_DRAW_MARGIN*2) ) / cdc.cwidth;
+	CLAMP(cdc.console_width, 1, INT_MAX); /* avoid divide by zero on small windows */
 	cdc.winx= tvc->winx-(CONSOLE_DRAW_MARGIN+CONSOLE_DRAW_SCROLL);
 	cdc.ymin= tvc->ymin;
 	cdc.ymax= tvc->ymax;