[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34561] trunk/blender/source/blender: Stupid error in commit to allow .blend1 and .blend2 being dropped in

[Ton Roosendaal]

Revision: 34561
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34561
Author:   ton
Date:     2011-01-30 12:26:16 +0000 (Sun, 30 Jan 2011)
Log Message:
-----------
Stupid error in commit to allow .blend1 and .blend2 being dropped in
window caused .blend itself to be not seen :) Mea Maxima Culpa!

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/intern/path_util.c
    trunk/blender/source/blender/blenloader/intern/readfile.c

Modified: trunk/blender/source/blender/blenlib/intern/path_util.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/path_util.c	2011-01-30 07:04:12 UTC (rev 34560)
+++ trunk/blender/source/blender/blenlib/intern/path_util.c	2011-01-30 12:26:16 UTC (rev 34561)
@@ -1319,21 +1319,22 @@
 int BLI_testextensie(const char *str, const char *ext)
 {
 	short a, b;
-	int retval;
-
+	int retval= 0;
+	
 	a= strlen(str);
 	b= strlen(ext);
-
+	
 	if(a==0 || b==0 || b>=a) {
 		retval = 0;
-	} 
+	}
 	else {
-		if(ext[b-1]=='*')
-			retval= 0==BLI_strncasecmp(ext, str + a - b, b-1);
-		else
-			retval= 0==BLI_strcasecmp(ext, str + a - b);
+		/* allow .blend1 .blend2 */
+		char *loc= BLI_strcasestr(str+a-b-1, ext);
+		
+		if(loc)
+			retval= 1;
 	}
-
+	
 	return (retval);
 }
 

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2011-01-30 07:04:12 UTC (rev 34560)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2011-01-30 12:26:16 UTC (rev 34561)
@@ -1039,7 +1039,7 @@
 
 int BLO_has_bfile_extension(char *str)
 {
-	return (BLI_testextensie(str, ".ble") || BLI_testextensie(str, ".blend*")||BLI_testextensie(str, ".blend.gz"));
+	return (BLI_testextensie(str, ".ble") || BLI_testextensie(str, ".blend")||BLI_testextensie(str, ".blend.gz"));
 }
 
 int BLO_is_a_library(const char *path, char *dir, char *group)