[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28643] trunk/blender/source/blender: saving multires data didnt get the new filename when the external struct was alredy allocated (making save external fail)

[Campbell Barton]

Revision: 28643
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28643
Author:   campbellbarton
Date:     2010-05-07 11:41:26 +0200 (Fri, 07 May 2010)

Log Message:
-----------
saving multires data didnt get the new filename when the external struct was alredy allocated (making save external fail)

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/customdata.c
    trunk/blender/source/blender/editors/object/object_modifier.c

Modified: trunk/blender/source/blender/blenkernel/intern/customdata.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/customdata.c	2010-05-07 08:10:20 UTC (rev 28642)
+++ trunk/blender/source/blender/blenkernel/intern/customdata.c	2010-05-07 09:41:26 UTC (rev 28643)
@@ -2487,9 +2487,9 @@
 
 	if(!external) {
 		external= MEM_callocN(sizeof(CustomDataExternal), "CustomDataExternal");
-		BLI_strncpy(external->filename, filename, sizeof(external->filename));
 		data->external= external;
 	}
+	BLI_strncpy(external->filename, filename, sizeof(external->filename));
 
 	layer->flag |= CD_FLAG_EXTERNAL|CD_FLAG_IN_MEMORY;
 }

Modified: trunk/blender/source/blender/editors/object/object_modifier.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_modifier.c	2010-05-07 08:10:20 UTC (rev 28642)
+++ trunk/blender/source/blender/editors/object/object_modifier.c	2010-05-07 09:41:26 UTC (rev 28643)
@@ -1021,9 +1021,9 @@
 		return OPERATOR_CANCELLED;
 	
 	RNA_string_get(op->ptr, "path", path);
-	if(G.save_over)
-		BLI_path_rel(path, G.sce);
 
+	/* BLI_path_rel(path, G.sce); */ /* TODO, relative path operator option */
+
 	CustomData_external_add(&me->fdata, &me->id, CD_MDISPS, me->totface, path);
 	CustomData_external_write(&me->fdata, &me->id, CD_MASK_MESH, me->totface, 0);