Bugfix #6312
authorTon Roosendaal <ton@blender.org>
Thu, 29 Mar 2007 10:09:44 +0000 (10:09 +0000)
committerTon Roosendaal <ton@blender.org>
Thu, 29 Mar 2007 10:09:44 +0000 (10:09 +0000)
When saving files (images), the filewindow was giving relative paths on
a save-over menu.

Also: added in group.c a note about problems with timeoffset.

source/blender/blenkernel/intern/group.c
source/blender/src/filesel.c

index 5e6c3370db52d956847c2bc249268bccb0e35a32..201d93220f9b27fe27656ea72e9d58f6197609c3 100644 (file)
@@ -231,6 +231,8 @@ static void group_replaces_nla(Object *parent, Object *target, char mode)
 
 /* puts all group members in local timing system, after this call
 you can draw everything, leaves tags in objects to signal it needs further updating */
+
+/* note: does not work for derivedmesh and render... it recreates all again in convertblender.c */
 void group_handle_recalc_and_update(Object *parent, Group *group)
 {
        GroupObject *go;
index aea0b8d49cf4ed8f3880b02d5fa891b5270b50e1..d2ac3115c0fa19bac9912e181c70dfa7e61aae6a 100644 (file)
@@ -1681,8 +1681,8 @@ static void filesel_execute(SpaceFile *sfile)
                        strcat(name, sfile->file);
                        
                        if(sfile->flag & FILE_STRINGCODE) {
-                               /* still weak, but we don't want saving .blends to make relative paths */
-                               if(sfile->returnfunc!=BIF_write_file)
+                               /* still weak, but we don't want saving files to make relative paths */
+                               if(strncmp(sfile->title, "Save", 4))
                                        BLI_makestringcode(G.sce, name);
                        }
                        if(sfile->returnfunc)