Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2017-07-10 17:49:04 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2017-07-10 17:49:04 +0300
commitbb0bdc6ce262b6293bd351c97ea05990c9315dd7 (patch)
treed7ddc57d9072df37553fcf9c76db1bc21926f116 /source/blender/editors/render
parent205d750a634c2ed8d02ebc8ffbf8d653769d9a79 (diff)
Revert "Revert "Revert "Temporarily disable material preview (T51796 workaround)"""
This reverts commit 6df053e527b2808767f3a3417e1e7d683b979149.
Diffstat (limited to 'source/blender/editors/render')
-rw-r--r--source/blender/editors/render/render_preview.c6
1 files changed, 0 insertions, 6 deletions
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;