diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-02-16 21:58:15 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-02-16 21:58:15 +0300 |
| commit | f809cb6fcbf39d5538e136c6bac5fa527e85af70 (patch) | |
| tree | 9f3097b882b6b389400fba120f3e2291efc28b65 /source/blender | |
| parent | eb7d8651f1b9c1e7f473ea62f2cc1a39202fde57 (diff) | |
Last minute fixes for render crash.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/editors/screen/screen_ops.c | 3 | ||||
| -rw-r--r-- | source/blender/render/intern/source/texture.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 54dd27c864f..0e4498950fa 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -3143,8 +3143,6 @@ static void render_startjob(void *rjv, short *stop, short *do_update) pthread_setspecific (gomp_tls_key, thread_tls_data); #endif - BKE_image_backup_render(rj->scene, rj->image); - if(rj->anim) RE_BlenderAnim(rj->re, rj->scene, rj->scene->r.sfra, rj->scene->r.efra, rj->scene->r.frame_step, rj->reports); else @@ -3258,6 +3256,7 @@ static int screen_render_invoke(bContext *C, wmOperator *op, wmEvent *event) /* get a render result image, and make sure it is empty */ ima= BKE_image_verify_viewer(IMA_TYPE_R_RESULT, "Render Result"); BKE_image_signal(ima, NULL, IMA_SIGNAL_FREE); + BKE_image_backup_render(rj->scene, ima); rj->image= ima; /* setup new render */ diff --git a/source/blender/render/intern/source/texture.c b/source/blender/render/intern/source/texture.c index 0fe6a2d921a..17ff1238061 100644 --- a/source/blender/render/intern/source/texture.c +++ b/source/blender/render/intern/source/texture.c @@ -1322,7 +1322,7 @@ int multitex_nodes(Tex *tex, float *texvec, float *dxt, float *dyt, int osatex, } do_2d_mapping(&localmtex, texvec_l, NULL, NULL, dxt_l, dyt_l); - rgbnor= multitex(tex, texvec, dxt, dyt, osatex, texres, thread, which_output); + rgbnor= multitex(tex, texvec, dxt_l, dyt_l, osatex, texres, thread, which_output); } return rgbnor; |