diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-20 18:38:11 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-20 18:38:11 +0400 |
| commit | f1eb66aa68105ac27f371f4f708d8abf3b7da38b (patch) | |
| tree | 77ce3c813f25702880e330740e06ae60a0aadca8 /source/blender/editors/screen/screendump.c | |
| parent | be701c7336a3f967a3a2807f8a7a0c511cb76815 (diff) | |
share code for fluidsim, ocean & dynamic paint file paths.
- use BLI_join_dirfile for joining all paths (no need to ensure slash is appended).
- paths from linked library files now supported.
Diffstat (limited to 'source/blender/editors/screen/screendump.c')
| -rw-r--r-- | source/blender/editors/screen/screendump.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/screen/screendump.c b/source/blender/editors/screen/screendump.c index 017325c535e..8a90aadbee2 100644 --- a/source/blender/editors/screen/screendump.c +++ b/source/blender/editors/screen/screendump.c @@ -219,6 +219,7 @@ void SCREEN_OT_screenshot(wmOperatorType *ot) /* *************** screenshot movie job ************************* */ typedef struct ScreenshotJob { + Main *bmain; Scene *scene; unsigned int *dumprect; int x, y, dumpsx, dumpsy; @@ -297,7 +298,7 @@ static void screenshot_startjob(void *sjv, short *stop, short *do_update, float char name[FILE_MAXDIR+FILE_MAXFILE]; int ok; - BKE_makepicstring(name, rd.pic, cfra, rd.imtype, rd.scemode & R_EXTENSION, TRUE); + BKE_makepicstring(name, rd.pic, sj->bmain->name, cfra, rd.imtype, rd.scemode & R_EXTENSION, TRUE); ibuf->rect= sj->dumprect; ok= BKE_write_ibuf(ibuf, name, rd.imtype, rd.subimtype, rd.quality); @@ -355,6 +356,7 @@ static int screencast_exec(bContext *C, wmOperator *op) sj->dumpsx= curarea->totrct.xmax - sj->x; sj->dumpsy= curarea->totrct.ymax - sj->y; } + sj->bmain= CTX_data_main(C); sj->scene= CTX_data_scene(C); BKE_reports_init(&sj->reports, RPT_PRINT); |