[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11799] branches/soc-2007-maike/source/ blender/src/glsl_util.c: Change to string concatenation function for float values

Miguel Torres Lima torreslima at gmail.com
Thu Aug 23 20:20:45 CEST 2007


Revision: 11799
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11799
Author:   maike
Date:     2007-08-23 20:20:45 +0200 (Thu, 23 Aug 2007)

Log Message:
-----------
Change to string concatenation function for float values

Modified Paths:
--------------
    branches/soc-2007-maike/source/blender/src/glsl_util.c

Modified: branches/soc-2007-maike/source/blender/src/glsl_util.c
===================================================================
--- branches/soc-2007-maike/source/blender/src/glsl_util.c	2007-08-23 18:20:13 UTC (rev 11798)
+++ branches/soc-2007-maike/source/blender/src/glsl_util.c	2007-08-23 18:20:45 UTC (rev 11799)
@@ -162,15 +162,15 @@
 	MEM_freeN(tmp_str);
     }
     else if(type == GFLOAT){
-      tmp_float = va_arg(ap, float);
+      tmp_float = (float) va_arg(ap, double);
       tmp_str = MEM_mallocN(sizeof(char) * 9, "GLSL float");
       sprintf(tmp_str, "%f", tmp_float);
-      tmp_str[8] = '\0';
 
       code = glsl_concat_strings(code, tmp_str);
 
       if(tmp_str)
 	MEM_freeN(tmp_str);
+      
     }
     else{
       /* error */





More information about the Bf-blender-cvs mailing list