diff options
author | Campbell Barton <ideasman42@gmail.com> | 2016-03-11 14:13:28 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2016-03-11 14:14:45 +0300 |
commit | 59c47ecf90c5a0cd33646a610e4b3df1d516ad48 (patch) | |
tree | 3afa1be4d235ea3ed4e0edc75fcb5b5116dcd24c | |
parent | 758b20b8ca824f29696d8c009c43be14a0c18669 (diff) |
Revert "Use render path as initial location when saving renders"
This reverts commit cd6442f7d4b56cb40102d86404fbaeae30dd2d32.
Broke workflow for incrementally saving versions of a render.
-rw-r--r-- | source/blender/editors/space_image/image_ops.c | 18 | ||||
-rw-r--r-- | source/blender/render/intern/source/render_result.c | 1 |
2 files changed, 8 insertions, 11 deletions
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index 14e39da841c..eb74922a256 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -1528,21 +1528,19 @@ static int save_image_options_init(SaveImageOptions *simopts, SpaceImage *sima, /* check for empty path */ if (guess_path && simopts->filepath[0] == 0) { - const bool is_pref_save = !STREQ(G.ima, "//"); - RenderResult *rr = BKE_image_acquire_renderresult(scene, ima); + const bool is_prev_save = !STREQ(G.ima, "//"); if (save_as_render) { - const int cfra = rr ? rr->framenr : scene->r.cfra; - BKE_image_path_from_imformat( - simopts->filepath, scene->r.pic, G.main->name, cfra, - &simopts->im_format, (scene->r.scemode & R_EXTENSION) != 0, true, NULL); - - if (rr) { - BKE_image_release_renderresult(scene, ima); + if (is_prev_save) { + BLI_strncpy(simopts->filepath, G.ima, sizeof(simopts->filepath)); + } + else { + BLI_strncpy(simopts->filepath, "//untitled", sizeof(simopts->filepath)); + BLI_path_abs(simopts->filepath, G.main->name); } } else { BLI_snprintf(simopts->filepath, sizeof(simopts->filepath), "//%s", ima->id.name + 2); - BLI_path_abs(simopts->filepath, is_pref_save ? G.ima : G.main->name); + BLI_path_abs(simopts->filepath, is_prev_save ? G.ima : G.main->name); } } diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/source/render_result.c index 545827033b0..2d26fcf4905 100644 --- a/source/blender/render/intern/source/render_result.c +++ b/source/blender/render/intern/source/render_result.c @@ -605,7 +605,6 @@ RenderResult *render_result_new(Render *re, rcti *partrct, int crop, int savebuf rr->renrect.xmin = 0; rr->renrect.xmax = rectx - 2 * crop; /* crop is one or two extra pixels rendered for filtering, is used for merging and display too */ rr->crop = crop; - rr->framenr = re->r.cfra; /* tilerect is relative coordinates within render disprect. do not subtract crop yet */ rr->tilerect.xmin = partrct->xmin - re->disprect.xmin; |