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

[Sergey Sharybin]

Commit: 6df053e527b2808767f3a3417e1e7d683b979149
Author: Sergey Sharybin
Date:   Mon Jul 10 15:43:04 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB6df053e527b2808767f3a3417e1e7d683b979149

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

The "fix" happened due to a mistake in copy-on-write commit, that mistake solved
preview render but broke something else.

This reverts commit 45720922f7b927865b9b63f31c9d2a0b3d4b753e.

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

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 7292856567f..d38ffd8a4b6 100644
--- a/source/blender/editors/render/render_preview.c
+++ b/source/blender/editors/render/render_preview.c
@@ -1266,6 +1266,9 @@ 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;
 
@@ -1308,6 +1311,9 @@ 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;