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

[Sergey Sharybin]

Commit: bb0bdc6ce262b6293bd351c97ea05990c9315dd7
Author: Sergey Sharybin
Date:   Mon Jul 10 16:49:04 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBbb0bdc6ce262b6293bd351c97ea05990c9315dd7

Revert "Revert "Revert "Temporarily disable material preview (T51796 workaround)"""

This reverts commit 6df053e527b2808767f3a3417e1e7d683b979149.

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

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 d38ffd8a4b6..7292856567f 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;