diff options
| author | Luca Rood <dev@lucarood.com> | 2017-06-23 12:55:04 +0300 |
|---|---|---|
| committer | Luca Rood <dev@lucarood.com> | 2017-06-23 13:26:54 +0300 |
| commit | 45720922f7b927865b9b63f31c9d2a0b3d4b753e (patch) | |
| tree | e52f21ebe81595b87029d4833c0ef7cc6f95025e /source/blender/editors/render/render_preview.c | |
| parent | a764044cccc2f31c75d27d60e38dcd9f4d80b836 (diff) | |
Revert "Temporarily disable material preview (T51796 workaround)"
This reverts commit 0d9611718d89636d0d407555252b3a6a1d7ef2f9.
The preview issues have been solved by CoW commit
802027f3f8f9a83a77134a2b104a25ff3a4ac013
Diffstat (limited to 'source/blender/editors/render/render_preview.c')
| -rw-r--r-- | source/blender/editors/render/render_preview.c | 6 |
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 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; |