[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34553] trunk/blender/source/blender: Todo list fix: .blend backup files are recognized as such now;

[Ton Roosendaal]

Revision: 34553
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34553
Author:   ton
Date:     2011-01-29 17:47:22 +0000 (Sat, 29 Jan 2011)
Log Message:
-----------
Todo list fix: .blend backup files are recognized as such now;
for drop inside Blender window and icons. (.blend1, .blend2, etc).

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-29 16:27:48 UTC (rev 34552)
+++ trunk/blender/source/blender/blenlib/intern/path_util.c	2011-01-29 17:47:22 UTC (rev 34553)
@@ -1315,6 +1315,7 @@
 	BLI_clean(string);
 }
 
+/* if ext is .blend*, it doesn't compare last char */
 int BLI_testextensie(const char *str, const char *ext)
 {
 	short a, b;
@@ -1325,10 +1326,12 @@
 
 	if(a==0 || b==0 || b>=a) {
 		retval = 0;
-	} else if (BLI_strcasecmp(ext, str + a - b)) {
-		retval = 0;	
-	} else {
-		retval = 1;
+	} 
+	else {
+		if(ext[b-1]=='*')
+			retval= 0==BLI_strncasecmp(ext, str + a - b, b-1);
+		else
+			retval= 0==BLI_strcasecmp(ext, str + a - b);
 	}
 
 	return (retval);

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2011-01-29 16:27:48 UTC (rev 34552)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2011-01-29 17:47:22 UTC (rev 34553)
@@ -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)