[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12956] trunk/blender/source/blender: make relative paths wasnt working, also disallowed it when the blend file isnt saved

[Campbell Barton]

Revision: 12956
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12956
Author:   campbellbarton
Date:     2007-12-20 11:52:56 +0100 (Thu, 20 Dec 2007)

Log Message:
-----------
make relative paths wasnt working, also disallowed it when the blend file isnt saved

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/intern/bpath.c
    trunk/blender/source/blender/src/header_info.c

Modified: trunk/blender/source/blender/blenlib/intern/bpath.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/bpath.c	2007-12-20 10:38:01 UTC (rev 12955)
+++ trunk/blender/source/blender/blenlib/intern/bpath.c	2007-12-20 10:52:56 UTC (rev 12956)
@@ -345,7 +345,7 @@
 		filepath = BLI_bpathIterator_getPath(&bpi);
 		libpath = BLI_bpathIterator_getLib(&bpi);
 		
-		if(strncmp(filepath, "//", 2)==0) {
+		if(strncmp(filepath, "//", 2)) {
 			if (libpath) { /* cant make relative if we are kibrary - TODO, LOG THIS */
 				(*linked)++;
 			} else { /* local data, use the blend files path */
@@ -356,10 +356,10 @@
 				} else {
 					/* safe to to check the length */
 					if(strncmp(filepath_relative, "//", 2)==0) {
-						(*failed)++;
-					} else {
 						strcpy(filepath, filepath_relative);
 						(*changed)++;
+					} else {
+						(*failed)++;
 					}
 				}
 			}

Modified: trunk/blender/source/blender/src/header_info.c
===================================================================
--- trunk/blender/source/blender/src/header_info.c	2007-12-20 10:38:01 UTC (rev 12955)
+++ trunk/blender/source/blender/src/header_info.c	2007-12-20 10:52:56 UTC (rev 12956)
@@ -953,12 +953,14 @@
 		}
 		break;
 	case 10: /* make all paths relative */
-		{
+		if (G.relbase_valid) {
 			int tot,changed,failed,linked;
 			char str[512];
 			makeFilesRelative(&tot, &changed, &failed, &linked);
 			sprintf(str, "Make Relative%%t|Total files %i|Changed %i|Failed %i|Linked %i", tot, changed, failed, linked);
 			pupmenu(str);
+		} else {
+			pupmenu("Can't set relative paths with an unsaved blend file");
 		}
 		break;
 	case 11: /* check images exist */