[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40258] trunk/blender/source/blender/ blenkernel/intern: Fix #28663: All "unit" properties show a value of 0 ( on WinXP&MinGW&scons)

[Sergey Sharybin]

Revision: 40258
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40258
Author:   nazgul
Date:     2011-09-16 10:03:08 +0000 (Fri, 16 Sep 2011)
Log Message:
-----------
Fix #28663: All "unit" properties show a value of 0 (on WinXP&MinGW&scons)

Initially problem was caused by updated version of mingw-runtime which
changed behavior of snprintf and vsnprintf so %lf isn't anymore valid
for doubles.

According to manpages, %f is a correct format for snprintf for doubles.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/collision.c
    trunk/blender/source/blender/blenkernel/intern/image.c
    trunk/blender/source/blender/blenkernel/intern/unit.c

Modified: trunk/blender/source/blender/blenkernel/intern/collision.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/collision.c	2011-09-16 09:02:31 UTC (rev 40257)
+++ trunk/blender/source/blender/blenkernel/intern/collision.c	2011-09-16 10:03:08 UTC (rev 40258)
@@ -2021,7 +2021,7 @@
 			{
 				if(edgecollpair.p21==6 || edgecollpair.p22 == 6)
 				{
-					printf("dist: %f, sol[k]: %lf, sol2[k]: %lf\n", distance, solution[k], solution2[k]);
+					printf("dist: %f, sol[k]: %f, sol2[k]: %f\n", distance, solution[k], solution2[k]);
 					printf("a1: %f, a2: %f, b1: %f, b2: %f\n", x1[0], x2[0], x3[0], v1[0]);
 					printf("b21: %d, b22: %d\n", edgecollpair.p21, edgecollpair.p22);
 				}

Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c	2011-09-16 09:02:31 UTC (rev 40257)
+++ trunk/blender/source/blender/blenkernel/intern/image.c	2011-09-16 10:03:08 UTC (rev 40258)
@@ -592,7 +592,7 @@
 	for(ima= G.main->image.first; ima; ima= ima->id.next)
 		totsize += image_mem_size(ima);
 
-	printf("\ntotal image memory len: %.3lf MB\n", (double)totsize/(double)(1024*1024));
+	printf("\ntotal image memory len: %.3f MB\n", (double)totsize/(double)(1024*1024));
 
 	for(ima= G.main->image.first; ima; ima= ima->id.next) {
 		size= image_mem_size(ima);

Modified: trunk/blender/source/blender/blenkernel/intern/unit.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/unit.c	2011-09-16 09:02:31 UTC (rev 40257)
+++ trunk/blender/source/blender/blenkernel/intern/unit.c	2011-09-16 10:03:08 UTC (rev 40258)
@@ -345,7 +345,7 @@
 
 	/* Convert to a string */
 	{
-		len= BLI_snprintf(str, len_max, "%.*lf", prec, value_conv);
+		len= BLI_snprintf(str, len_max, "%.*f", prec, value_conv);
 
 		if(len >= len_max)
 			len= len_max;