sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix [#23539] Blender Generated Static Environments Fail To Save

Browse Source 
reported by bowels

Saving environment map didn't look at relative_path setting, made it do so.
This commit is contained in:
Nathan Letwory 2010-09-23 22:44:03 +00:00
parent 02fd98e1cf
commit af27774158
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/editors/render/render_shading.c
View File

@ -816,6 +816,7 @@ static int save_envmap(wmOperator *op, Scene *scene, EnvMap *env, char *str, int
ImBuf *ibuf=NULL; ImBuf *ibuf=NULL;
int dx; int dx;
int retval; int retval;
int relative= (RNA_struct_find_property(op->ptr, "relative_path") && RNA_boolean_get(op->ptr, "relative_path"));
if(env->cube[1]==NULL) { if(env->cube[1]==NULL) {
BKE_report(op->reports, RPT_ERROR, "There is no generated environment map available to save"); BKE_report(op->reports, RPT_ERROR, "There is no generated environment map available to save");
@ -842,6 +843,9 @@ static int save_envmap(wmOperator *op, Scene *scene, EnvMap *env, char *str, int
if (scene->r.color_mgt_flag & R_COLOR_MANAGEMENT) if (scene->r.color_mgt_flag & R_COLOR_MANAGEMENT)
ibuf->profile = IB_PROFILE_LINEAR_RGB; 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)) { if (BKE_write_ibuf(scene, ibuf, str, imtype, scene->r.subimtype, scene->r.quality)) {
retval = OPERATOR_FINISHED; retval = OPERATOR_FINISHED;
} }
@ -849,6 +853,9 @@ static int save_envmap(wmOperator *op, Scene *scene, EnvMap *env, char *str, int
BKE_reportf(op->reports, RPT_ERROR, "Error saving environment map to %s.", str); BKE_reportf(op->reports, RPT_ERROR, "Error saving environment map to %s.", str);
retval = OPERATOR_CANCELLED; 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); IMB_freeImBuf(ibuf);
ibuf = NULL; ibuf = NULL;