[Bf-blender-cvs] [45720922f7b] blender2.8: Revert "Temporarily disable material preview (T51796 workaround)"

Luca Rood noreply at git.blender.org
Fri Jun 23 12:27:23 CEST 2017


Commit: 45720922f7b927865b9b63f31c9d2a0b3d4b753e
Author: Luca Rood
Date:   Fri Jun 23 11:55:04 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB45720922f7b927865b9b63f31c9d2a0b3d4b753e

Revert "Temporarily disable material preview (T51796 workaround)"

This reverts commit 0d9611718d89636d0d407555252b3a6a1d7ef2f9.

The preview issues have been solved by CoW commit
802027f3f8f9a83a77134a2b104a25ff3a4ac013

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

M	source/blender/editors/render/render_preview.c

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

diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c
index 1f1924ef53c..ae938c3fa30 100644
--- a/source/blender/editors/render/render_preview.c
+++ b/source/blender/editors/render/render_preview.c
@@ -1266,9 +1266,6 @@ void ED_preview_icon_render(Main *bmain, Scene *scene, ID *id, unsigned int *rec
 
 void ED_preview_icon_job(const bContext *C, void *owner, ID *id, unsigned int *rect, int sizex, int sizey)
 {
-	/* XXX Temporarily disabling preview, as this breaks some memory chunks (See T51796). */
-	return;
-
 	wmJob *wm_job;
 	IconPreview *ip, *old_ip;
 
@@ -1311,9 +1308,6 @@ void ED_preview_icon_job(const bContext *C, void *owner, ID *id, unsigned int *r
 
 void ED_preview_shader_job(const bContext *C, void *owner, ID *id, ID *parent, MTex *slot, int sizex, int sizey, int method)
 {
-	/* XXX Temporarily disabling preview, as this breaks some memory chunks (See T51796). */
-	return;
-
 	Object *ob = CTX_data_active_object(C);
 	wmJob *wm_job;
 	ShaderPreview *sp;




More information about the Bf-blender-cvs mailing list