From a868e8623ca7218dfa363962e178293f4a8f0690 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 8 Jan 2010 13:52:38 +0000 Subject: - RNA support for returning copied strings from functions, flagging strings as PROP_THICK_WRAP does this. - scene.render_data.frame_path(frame=num), returns the output path for rending images of video. - scene.render_data.file_extension, readonly attribute, gives the extension ".jpg", ".mov" etc - player support was guessing names, use the above functions to get the actual names used, accounting for #'s replacing numbers. --- source/blender/editors/screen/screen_ops.c | 2 +- source/blender/editors/screen/screendump.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender/editors/screen') diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index c938f0997ea..4125ced4e71 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -3413,7 +3413,7 @@ static int screen_opengl_render_modal(bContext *C, wmOperator *op, wmEvent *even printf("Append frame %d", scene->r.cfra); } else { - BKE_makepicstring(scene, name, scene->r.pic, scene->r.cfra, scene->r.imtype); + BKE_makepicstring(name, scene->r.pic, scene->r.cfra, scene->r.imtype, scene->r.scemode & R_EXTENSION); ok= BKE_write_ibuf(scene, ibuf, name, scene->r.imtype, scene->r.subimtype, scene->r.quality); if(ok==0) printf("write error: cannot save %s\n", name); diff --git a/source/blender/editors/screen/screendump.c b/source/blender/editors/screen/screendump.c index 088be194fe8..7fea28304ba 100644 --- a/source/blender/editors/screen/screendump.c +++ b/source/blender/editors/screen/screendump.c @@ -84,7 +84,7 @@ static int screenshot_exec(bContext *C, wmOperator *op) /* BKE_add_image_extension() checks for if extension was already set */ if(scene->r.scemode & R_EXTENSION) if(strlen(path)r.imtype); + BKE_add_image_extension(path, scene->r.imtype); ibuf= IMB_allocImBuf(scd->dumpsx, scd->dumpsy, 24, 0, 0); ibuf->rect= scd->dumprect; @@ -258,7 +258,7 @@ static void screenshot_startjob(void *sjv, short *stop, short *do_update) char name[FILE_MAXDIR+FILE_MAXFILE]; int ok; - BKE_makepicstring(sj->scene, name, rd.pic, cfra, rd.imtype); + BKE_makepicstring(name, rd.pic, cfra, rd.imtype, rd.scemode & R_EXTENSION); ibuf->rect= sj->dumprect; ok= BKE_write_ibuf(sj->scene, ibuf, name, rd.imtype, rd.subimtype, rd.quality); -- cgit v1.2.3