griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Last minute fixes for render crash.

Browse Source
This commit is contained in:
Brecht Van Lommel
2010-02-16 18:58:15 +00:00
parent eb7d8651f1
commit f809cb6fcb
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/editors/screen/screen_ops.c
View File

@@ -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 */

2
source/blender/render/intern/source/texture.c
View File

@@ -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;