[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26971] trunk/blender/source/blender: Last minute fixes for render crash.

Brecht Van Lommel brecht at blender.org
Tue Feb 16 19:58:15 CET 2010


Revision: 26971
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26971
Author:   blendix
Date:     2010-02-16 19:58:15 +0100 (Tue, 16 Feb 2010)

Log Message:
-----------
Last minute fixes for render crash.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/screen/screen_ops.c
    trunk/blender/source/blender/render/intern/source/texture.c

Modified: trunk/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_ops.c	2010-02-16 18:16:54 UTC (rev 26970)
+++ trunk/blender/source/blender/editors/screen/screen_ops.c	2010-02-16 18:58:15 UTC (rev 26971)
@@ -3143,8 +3143,6 @@
 	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 @@
 	/* 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, rj->image);
 	rj->image= ima;
 	
 	/* setup new render */

Modified: trunk/blender/source/blender/render/intern/source/texture.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/texture.c	2010-02-16 18:16:54 UTC (rev 26970)
+++ trunk/blender/source/blender/render/intern/source/texture.c	2010-02-16 18:58:15 UTC (rev 26971)
@@ -1322,7 +1322,7 @@
 			}
 			
 			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;





More information about the Bf-blender-cvs mailing list