svn merge ^/trunk/blender -r46380:HEAD
[blender-staging.git] / source / blender / windowmanager / intern / wm_operators.c
index 27c4a38c1315fee3ca16d5d6eade199028193732..ed57e305fc93cda0f486341744d2310a53b60fef 100644 (file)
@@ -84,7 +84,6 @@
 
 #include "ED_screen.h"
 #include "ED_util.h"
-#include "ED_object.h"
 
 #include "RNA_access.h"
 #include "RNA_define.h"
@@ -2135,12 +2134,7 @@ static int wm_collada_export_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED
 {      
        if (!RNA_struct_property_is_set(op->ptr, "filepath")) {
                char filepath[FILE_MAX];
-
-               if (G.main->name[0] == 0)
-                       BLI_strncpy(filepath, "untitled", sizeof(filepath));
-               else
-                       BLI_strncpy(filepath, G.main->name, sizeof(filepath));
-
+               BLI_strncpy(filepath, G.main->name, sizeof(filepath));
                BLI_replace_extension(filepath, sizeof(filepath), ".dae");
                RNA_string_set(op->ptr, "filepath", filepath);
        }