[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32088] trunk/blender/source/blender/ editors/render/render_shading.c: Fix [#23539] Blender Generated Static Environments Fail To Save

[Nathan Letwory]

Revision: 32088
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32088
Author:   jesterking
Date:     2010-09-24 00:44:03 +0200 (Fri, 24 Sep 2010)

Log Message:
-----------
Fix [#23539] Blender Generated Static Environments Fail To Save
reported by bowels

Saving environment map didn't look at relative_path setting, made it do so.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/render/render_shading.c

Modified: trunk/blender/source/blender/editors/render/render_shading.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_shading.c	2010-09-23 21:38:01 UTC (rev 32087)
+++ trunk/blender/source/blender/editors/render/render_shading.c	2010-09-23 22:44:03 UTC (rev 32088)
@@ -816,6 +816,7 @@
 	ImBuf *ibuf=NULL;
 	int dx;
 	int retval;
+	int relative= (RNA_struct_find_property(op->ptr, "relative_path") && RNA_boolean_get(op->ptr, "relative_path"));
 	
 	if(env->cube[1]==NULL) {
 		BKE_report(op->reports, RPT_ERROR, "There is no generated environment map available to save");
@@ -842,6 +843,9 @@
 	if (scene->r.color_mgt_flag & R_COLOR_MANAGEMENT)
 		ibuf->profile = IB_PROFILE_LINEAR_RGB;
 	
+	/* to save, we first get absolute path */
+	BLI_path_abs(str, G.sce);
+	
 	if (BKE_write_ibuf(scene, ibuf, str, imtype, scene->r.subimtype, scene->r.quality)) {
 		retval = OPERATOR_FINISHED;
 	}
@@ -849,6 +853,9 @@
 		BKE_reportf(op->reports, RPT_ERROR, "Error saving environment map to %s.", str);
 		retval = OPERATOR_CANCELLED;
 	}
+	/* in case we were saving with relative paths, change back again */
+	if(relative)
+		BLI_path_rel(str, G.sce);
 	
 	IMB_freeImBuf(ibuf);
 	ibuf = NULL;