diff options
author | Joseph Gilbert <ascotan@gmail.com> | 2006-05-26 01:34:00 +0400 |
---|---|---|
committer | Joseph Gilbert <ascotan@gmail.com> | 2006-05-26 01:34:00 +0400 |
commit | 2132bbb62125de853a74dd0a2372e4effec4bd4a (patch) | |
tree | fc2fbe1348d67a5a5afed8766fe665f13cadedc2 /source | |
parent | 2a6952f386d123c7bc260f65fe8c54a86d383de4 (diff) |
*python fix
- save_rendered_image_cb_real has a popup window embedded in it that prevents automation through python as a result python scripts would get a popup which is ignorned by the script
- modified so python scripts overwrite the image by default
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/python/api2_2x/sceneRender.c | 4 | ||||
-rw-r--r-- | source/blender/src/writeimage.c | 15 |
2 files changed, 12 insertions, 7 deletions
diff --git a/source/blender/python/api2_2x/sceneRender.c b/source/blender/python/api2_2x/sceneRender.c index 84b9ecb4c97..eb69f882614 100644 --- a/source/blender/python/api2_2x/sceneRender.c +++ b/source/blender/python/api2_2x/sceneRender.c @@ -61,7 +61,7 @@ struct View3D; /* keep me up here */ #define PY_FULL 2 extern void waitcursor(int); -extern void save_rendered_image_cb_real(char *name, int zbuf); +extern void save_rendered_image_cb_real(char *name, int zbuf, int confirm); //---------------------------------------Render prototypes------------- static PyObject *M_Render_CloseRenderWindow( PyObject * self ); @@ -932,7 +932,7 @@ PyObject *RenderData_SaveRenderedImage ( BPy_RenderData * self, PyObject *args ) BLI_splitdirstring(dir, str); strcpy(G.ima, dir); } - save_rendered_image_cb_real(filepath, zbuff); + save_rendered_image_cb_real(filepath, zbuff,0); } return EXPP_incr_ret(Py_None); } diff --git a/source/blender/src/writeimage.c b/source/blender/src/writeimage.c index c7a35805786..fc44dc3835f 100644 --- a/source/blender/src/writeimage.c +++ b/source/blender/src/writeimage.c @@ -86,10 +86,10 @@ void BIF_save_envmap(EnvMap *env, char *str) #define FTOCHAR(val) val<=0.0f?255: 255-(val>=255.0f?255: (char)(val)) /* callback for fileselect to save rendered image, renderresult was checked to exist */ -void save_rendered_image_cb_real(char *name, int zbuf) +void save_rendered_image_cb_real(char *name, int zbuf, int confirm) { char str[FILE_MAXDIR+FILE_MAXFILE]; - int pixel, end; + int pixel, end, overwrite; float *pixf = 0; char *pixc = 0; @@ -105,8 +105,13 @@ void save_rendered_image_cb_real(char *name, int zbuf) strcpy(str, name); BLI_convertstringcode(str, G.sce, G.scene->r.cfra); + + if (confirm) + overwrite = saveover(str); + else + overwrite = 1; - if(saveover(str)) { + if(overwrite) { RenderResult rres; ImBuf *ibuf; @@ -149,11 +154,11 @@ void save_rendered_image_cb_real(char *name, int zbuf) } static void save_rendered_image_cb(char *name) { - save_rendered_image_cb_real(name,0); + save_rendered_image_cb_real(name,0,1); } static void save_rendered_image_zbuf_cb(char *name) { - save_rendered_image_cb_real(name,1); + save_rendered_image_cb_real(name,1,1); } void save_image_filesel_str(char *str) |