Merge branch 'master' into blender2.8

Conflicts:
	source/blender/blenkernel/intern/blendfile.c
	source/blender/blenloader/intern/readfile.h
	source/blender/blenloader/intern/versioning_250.c
	source/blender/blenloader/intern/versioning_260.c
	source/blender/blenloader/intern/versioning_270.c
	source/blender/blenloader/intern/versioning_legacy.c
	source/blender/editors/render/render_shading.c
	source/blender/makesrna/intern/rna_movieclip.c
	source/blender/render/intern/source/pipeline.c
	source/blender/render/intern/source/voxeldata.c

2 files changed, 5 insertions, 5 deletions

diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c
index bf1ca68745f..a8688b26280 100644
--- a/source/blender/editors/space_sequencer/sequencer_add.c
+++ b/source/blender/editors/space_sequencer/sequencer_add.c
@@ -117,7 +117,7 @@ static void sequencer_generic_invoke_path__internal(bContext *C, wmOperator *op,
 			Main *bmain = CTX_data_main(C);
 			char path[FILE_MAX];
 			BLI_strncpy(path, last_seq->strip->dir, sizeof(path));
-			BLI_path_abs(path, bmain->name);
+			BLI_path_abs(path, BKE_main_blendfile_path(bmain));
 			RNA_string_set(op->ptr, identifier, path);
 		}
 	}
@@ -199,7 +199,7 @@ static void seq_load_operator_info(SeqLoadInfo *seq_load, bContext *C, wmOperato
 	}
 
 	if ((is_file != -1) && relative)
-		BLI_path_rel(seq_load->path, bmain->name);
+		BLI_path_rel(seq_load->path, BKE_main_blendfile_path(bmain));
 
 
 	if ((prop = RNA_struct_find_property(op->ptr, "frame_end"))) {
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c
index cc0f352a51e..b24817f2af8 100644
--- a/source/blender/editors/space_sequencer/sequencer_edit.c
+++ b/source/blender/editors/space_sequencer/sequencer_edit.c
@@ -3753,7 +3753,7 @@ static int sequencer_change_path_exec(bContext *C, wmOperator *op)
 			/* TODO, shouldn't this already be relative from the filesel?
 			 * (as the 'filepath' is) for now just make relative here,
 			 * but look into changing after 2.60 - campbell */
-			BLI_path_rel(directory, bmain->name);
+			BLI_path_rel(directory, BKE_main_blendfile_path(bmain));
 		}
 		BLI_strncpy(seq->strip->dir, directory, sizeof(seq->strip->dir));
 
@@ -3869,10 +3869,10 @@ static int sequencer_export_subtitles_invoke(bContext *C, wmOperator *op, const
 	if (!RNA_struct_property_is_set(op->ptr, "filepath")) {
 		char filepath[FILE_MAX];
 
-		if (bmain->name[0] == '\0')
+		if (BKE_main_blendfile_path(bmain)[0] == '\0')
 			BLI_strncpy(filepath, "untitled", sizeof(filepath));
 		else
-			BLI_strncpy(filepath, bmain->name, sizeof(filepath));
+			BLI_strncpy(filepath, BKE_main_blendfile_path(bmain), sizeof(filepath));
 
 		BLI_replace_extension(filepath, sizeof(filepath), ".srt");
 		RNA_string_set(op->ptr, "filepath", filepath);