Sculpt Branch:sculpt25

svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r25245:25315

3 files changed, 0 insertions, 22 deletions

diff --git a/source/blender/blenlib/BLI_string.h b/source/blender/blenlib/BLI_string.h
index fad3c337355..fb345de72e9 100644
--- a/source/blender/blenlib/BLI_string.h
+++ b/source/blender/blenlib/BLI_string.h
@@ -123,9 +123,6 @@ int BLI_natstrcmp(const char *s1, const char *s2);
 
 void BLI_timestr(double _time, char *str); /* time var is global */
 
-	/* Convert to hex string valid for file writing (2x length of original) */
-void BLI_strhex(char *hex, int maxlen, const char *str);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/source/blender/blenlib/intern/math_matrix.c b/source/blender/blenlib/intern/math_matrix.c
index 0be18fc451f..47b99bce8ab 100644
--- a/source/blender/blenlib/intern/math_matrix.c
+++ b/source/blender/blenlib/intern/math_matrix.c
@@ -1129,4 +1129,3 @@ void print_m4(char *str, float m[][4])
 	printf("\n");
 }
 
-
diff --git a/source/blender/blenlib/intern/string.c b/source/blender/blenlib/intern/string.c
index 3dc12174bd7..405f8c6db97 100644
--- a/source/blender/blenlib/intern/string.c
+++ b/source/blender/blenlib/intern/string.c
@@ -42,9 +42,6 @@
 
 #include "BLI_dynstr.h"
 #include "BLI_string.h"
-#ifdef WIN32
-#include "BLI_winstuff.h"
-#endif
 
 char *BLI_strdupn(const char *str, int len) {
 	char *n= MEM_mallocN(len+1, "strdup");
@@ -332,18 +329,3 @@ void BLI_timestr(double _time, char *str)
 	
 	str[11]=0;
 }
-
-void BLI_strhex(char *hex, int maxlen, const char *str)
-{
-	int len = 0;
-
-	while('\0' != *str && len+3 < maxlen) {
-		snprintf(hex, maxlen, "%02X", *str++);
-		hex += 2;
-		len += 2;
-	}
-
-	if(maxlen)
-		hex[0]= '\0';
-}
-