[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52956] trunk/blender/source/blender: region overlap feature missed view3d grid-scale text, increase string size for title text too.

Campbell Barton ideasman42 at gmail.com
Thu Dec 13 06:43:12 CET 2012


Revision: 52956
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52956
Author:   campbellbarton
Date:     2012-12-13 05:43:01 +0000 (Thu, 13 Dec 2012)
Log Message:
-----------
region overlap feature missed view3d grid-scale text, increase string size for title text too.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
    trunk/blender/source/blender/windowmanager/intern/wm_window.c

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_draw.c	2012-12-13 02:40:49 UTC (rev 52955)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_draw.c	2012-12-13 05:43:01 UTC (rev 52956)
@@ -3234,7 +3234,8 @@
 				BLI_snprintf(numstr, sizeof(numstr), "%s x %.4g", grid_unit, v3d->grid);
 			}
 
-			BLF_draw_default_ascii(U.widget_unit,  ar->winy - (USER_SHOW_VIEWPORTNAME ? 2 * U.widget_unit : U.widget_unit), 0.0f,
+			BLF_draw_default_ascii(draw_name_offset(ar) + U.widget_unit,
+			                       ar->winy - (USER_SHOW_VIEWPORTNAME ? 2 * U.widget_unit : U.widget_unit), 0.0f,
 			                       numstr[0] ? numstr : grid_unit, sizeof(numstr));
 		}
 	}

Modified: trunk/blender/source/blender/windowmanager/intern/wm_window.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_window.c	2012-12-13 02:40:49 UTC (rev 52955)
+++ trunk/blender/source/blender/windowmanager/intern/wm_window.c	2012-12-13 05:43:01 UTC (rev 52956)
@@ -309,7 +309,7 @@
 		
 		/* this is set to 1 if you don't have startup.blend open */
 		if (G.save_over && G.main->name[0]) {
-			char str[sizeof(G.main->name) + 12];
+			char str[sizeof(G.main->name) + 24];
 			BLI_snprintf(str, sizeof(str), "Blender%s [%s%s]", wm->file_saved ? "" : "*", G.main->name,
 			             G.main->recovered ? " (Recovered)" : "");
 			GHOST_SetTitle(win->ghostwin, str);




More information about the Bf-blender-cvs mailing list