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

3 files changed, 8 insertions, 7 deletions

diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c
index cdbfac06422..53849e0b3f3 100644
--- a/source/blender/editors/render/render_opengl.c
+++ b/source/blender/editors/render/render_opengl.c
@@ -407,7 +407,7 @@ static void screen_opengl_render_write(OGLRender *oglrender)
 	rr = RE_AcquireResultRead(oglrender->re);
 
 	BKE_image_path_from_imformat(
-	        name, scene->r.pic, oglrender->bmain->name, scene->r.cfra,
+	        name, scene->r.pic, BKE_main_blendfile_path(oglrender->bmain), scene->r.cfra,
 	        &scene->r.im_format, (scene->r.scemode & R_EXTENSION) != 0, false, NULL);
 
 	/* write images as individual images or stereo */
@@ -936,7 +936,7 @@ static void write_result_func(TaskPool * __restrict pool,
 		char name[FILE_MAX];
 		BKE_image_path_from_imformat(name,
 		                             scene->r.pic,
-		                             oglrender->bmain->name,
+		                             BKE_main_blendfile_path(oglrender->bmain),
 		                             cfra,
 		                             &scene->r.im_format,
 		                             (scene->r.scemode & R_EXTENSION) != 0,
@@ -1027,7 +1027,7 @@ static bool screen_opengl_render_anim_step(bContext *C, wmOperator *op)
 
 	if (!is_movie) {
 		BKE_image_path_from_imformat(
-		        name, scene->r.pic, oglrender->bmain->name, scene->r.cfra,
+		        name, scene->r.pic, BKE_main_blendfile_path(oglrender->bmain), scene->r.cfra,
 		        &scene->r.im_format, (scene->r.scemode & R_EXTENSION) != 0, true, NULL);
 
 		if ((scene->r.mode & R_NO_OVERWRITE) && BLI_exists(name)) {
diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c
index dc79d5d9847..808e36a0d90 100644
--- a/source/blender/editors/render/render_preview.c
+++ b/source/blender/editors/render/render_preview.c
@@ -114,7 +114,7 @@ ImBuf *get_brush_icon(Brush *brush)
 				// first use the path directly to try and load the file
 
 				BLI_strncpy(path, brush->icon_filepath, sizeof(brush->icon_filepath));
-				BLI_path_abs(path, G.main->name);
+				BLI_path_abs(path, BKE_main_blendfile_path_from_global());
 
 				/* use default colorspaces for brushes */
 				brush->icon_imbuf = IMB_loadiffname(path, flags, NULL);
@@ -123,7 +123,7 @@ ImBuf *get_brush_icon(Brush *brush)
 				if (!(brush->icon_imbuf)) {
 					folder = BKE_appdir_folder_id(BLENDER_DATAFILES, "brushicons");
 
-					BLI_make_file_string(G.main->name, path, folder, brush->icon_filepath);
+					BLI_make_file_string(BKE_main_blendfile_path_from_global(), path, folder, brush->icon_filepath);
 
 					if (path[0]) {
 						/* use fefault color spaces */
@@ -278,7 +278,7 @@ static Scene *preview_prepare_scene(Main *bmain, Scene *scene, ID *id, int id_ty
 	Base *base;
 	Main *pr_main = sp->pr_main;
 
-	memcpy(pr_main->name, bmain->name, sizeof(pr_main->name));
+	memcpy(pr_main->name, BKE_main_blendfile_path(bmain), sizeof(pr_main->name));
 
 	sce = preview_get_scene(pr_main);
 	if (sce) {
diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c
index fe87f8bdbb2..2083317f6a7 100644
--- a/source/blender/editors/render/render_shading.c
+++ b/source/blender/editors/render/render_shading.c
@@ -1572,13 +1572,14 @@ static int envmap_save_exec(bContext *C, wmOperator *op)
 
 static int envmap_save_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
 {
+	Main *bmain = CTX_data_main(C);
 	//Scene *scene= CTX_data_scene(C);
 
 	if (RNA_struct_property_is_set(op->ptr, "filepath"))
 		return envmap_save_exec(C, op);
 
 	//RNA_enum_set(op->ptr, "file_type", scene->r.im_format.imtype);
-	RNA_string_set(op->ptr, "filepath", G.main->name);
+	RNA_string_set(op->ptr, "filepath", BKE_main_blendfile_path(bmain));
 	WM_event_add_fileselect(C, op);
 
 	return OPERATOR_RUNNING_MODAL;