[Bf-blender-cvs] [3f8f417] master: Fix T43309 saving takes longer.

Antony Riakiotakis noreply at git.blender.org
Tue Jan 27 18:02:41 CET 2015


Commit: 3f8f4175c3030437df341b37c0d074638758f664
Author: Antony Riakiotakis
Date:   Tue Jan 27 17:58:29 2015 +0100
Branches: master
https://developer.blender.org/rB3f8f4175c3030437df341b37c0d074638758f664

Fix T43309 saving takes longer.

Issue is that world shader compilation and loading may take long so we
just draw file previews with premultiplied background. Should create the
old familiar transparent background files.

Thanks to Sergey for figuring out the issue.

===================================================================

M	source/blender/windowmanager/intern/wm_files.c

===================================================================

diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
index a500f24..81ffa66 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -846,11 +846,11 @@ static ImBuf *blend_file_thumb(Scene *scene, bScreen *screen, int **thumb_pt)
 	if (scene->camera) {
 		ibuf = ED_view3d_draw_offscreen_imbuf_simple(scene, scene->camera,
 		                                             BLEN_THUMB_SIZE * 2, BLEN_THUMB_SIZE * 2,
-		                                             IB_rect, OB_SOLID, false, false, false, R_ADDSKY, err_out);
+		                                             IB_rect, OB_SOLID, false, false, false, R_ALPHAPREMUL, err_out);
 	}
 	else {
 		ibuf = ED_view3d_draw_offscreen_imbuf(scene, v3d, ar, BLEN_THUMB_SIZE * 2, BLEN_THUMB_SIZE * 2,
-		                                      IB_rect, false, R_ADDSKY, err_out);
+		                                      IB_rect, false, R_ALPHAPREMUL, err_out);
 	}
 
 	if (ibuf) {




More information about the Bf-blender-cvs mailing list