Cleanup: use new accessors to blendfile path (Main.name).

3 files changed, 11 insertions, 10 deletions

diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index d01815a8bf2..9e93a30d212 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -3319,7 +3319,7 @@ void RE_BlenderFrame(Render *re, Main *bmain, Scene *scene, SceneRenderLayer *sr
 			else {
 				char name[FILE_MAX];
 				BKE_image_path_from_imformat(
-				        name, scene->r.pic, bmain->name, scene->r.cfra,
+				        name, scene->r.pic, BKE_main_blendfile_path(bmain), scene->r.cfra,
 				        &scene->r.im_format, (scene->r.scemode & R_EXTENSION) != 0, false, NULL);
 
 				/* reports only used for Movie */
@@ -3559,7 +3559,7 @@ static int do_write_image_or_movie(Render *re, Main *bmain, Scene *scene, bMovie
 			BLI_strncpy(name, name_override, sizeof(name));
 		else
 			BKE_image_path_from_imformat(
-			        name, scene->r.pic, bmain->name, scene->r.cfra,
+			        name, scene->r.pic, BKE_main_blendfile_path(bmain), scene->r.cfra,
 			        &scene->r.im_format, (scene->r.scemode & R_EXTENSION) != 0, true, NULL);
 
 		/* write images as individual images or stereo */
@@ -3754,7 +3754,7 @@ void RE_BlenderAnim(Render *re, Main *bmain, Scene *scene, Object *camera_overri
 			if (is_movie == false) {
 				if (scene->r.mode & (R_NO_OVERWRITE | R_TOUCH))
 					BKE_image_path_from_imformat(
-					        name, scene->r.pic, bmain->name, scene->r.cfra,
+					        name, scene->r.pic, BKE_main_blendfile_path(bmain), scene->r.cfra,
 					        &scene->r.im_format, (scene->r.scemode & R_EXTENSION) != 0, true, NULL);
 
 				if (scene->r.mode & R_NO_OVERWRITE) {
@@ -4076,7 +4076,7 @@ bool RE_WriteEnvmapResult(struct ReportList *reports, Scene *scene, EnvMap *env,
 
 	/* to save, we first get absolute path */
 	BLI_strncpy(filepath, relpath, sizeof(filepath));
-	BLI_path_abs(filepath, G.main->name);
+	BLI_path_abs(filepath, BKE_main_blendfile_path_from_global());
 
 	ok = BKE_imbuf_write(ibuf, filepath, &imf);
 
diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/source/render_result.c
index 6d2d0c8d490..1531d60c83b 100644
--- a/source/blender/render/intern/source/render_result.c
+++ b/source/blender/render/intern/source/render_result.c
@@ -1160,7 +1160,7 @@ void render_result_exr_file_merge(RenderResult *rr, RenderResult *rrpart, const
 void render_result_exr_file_path(Scene *scene, const char *layname, int sample, char *filepath)
 {
 	char name[FILE_MAXFILE + MAX_ID_NAME + MAX_ID_NAME + 100];
-	const char *fi = BLI_path_basename(G.main->name);
+	const char *fi = BLI_path_basename(BKE_main_blendfile_path_from_global());
 	
 	if (sample == 0) {
 		BLI_snprintf(name, sizeof(name), "%s_%s_%s.exr", fi, scene->id.name + 2, layname);
@@ -1254,10 +1254,11 @@ static void render_result_exr_file_cache_path(Scene *sce, const char *root, char
 	char path_hexdigest[33];
 
 	/* If root is relative, use either current .blend file dir, or temp one if not saved. */
-	if (G.main->name[0]) {
-		BLI_split_dirfile(G.main->name, dirname, filename, sizeof(dirname), sizeof(filename));
+	const char *blendfile_path = BKE_main_blendfile_path_from_global();
+	if (blendfile_path[0] != '\0') {
+		BLI_split_dirfile(blendfile_path, dirname, filename, sizeof(dirname), sizeof(filename));
 		BLI_replace_extension(filename, sizeof(filename), "");  /* strip '.blend' */
-		BLI_hash_md5_buffer(G.main->name, strlen(G.main->name), path_digest);
+		BLI_hash_md5_buffer(blendfile_path, strlen(blendfile_path), path_digest);
 	}
 	else {
 		BLI_strncpy(dirname, BKE_tempdir_base(), sizeof(dirname));
diff --git a/source/blender/render/intern/source/voxeldata.c b/source/blender/render/intern/source/voxeldata.c
index c45bde300e7..0d9f7b197e1 100644
--- a/source/blender/render/intern/source/voxeldata.c
+++ b/source/blender/render/intern/source/voxeldata.c
@@ -425,7 +425,7 @@ void cache_voxeldata(Tex *tex, int scene_frame)
 			init_frame_hair(vd, scene_frame);
 			return;
 		case TEX_VD_BLENDERVOXEL:
-			BLI_path_abs(path, G.main->name);
+			BLI_path_abs(path, BKE_main_blendfile_path_from_global());
 			fp = BLI_fopen(path, "rb");
 			if (!fp) return;
 			
@@ -435,7 +435,7 @@ void cache_voxeldata(Tex *tex, int scene_frame)
 			fclose(fp);
 			return;
 		case TEX_VD_RAW_8BIT:
-			BLI_path_abs(path, G.main->name);
+			BLI_path_abs(path, BKE_main_blendfile_path_from_global());
 			fp = BLI_fopen(path, "rb");
 			if (!fp) return;