diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-07-10 16:43:04 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-07-10 16:43:04 +0300 |
commit | 6df053e527b2808767f3a3417e1e7d683b979149 (patch) | |
tree | 72c3adcd3b22fd43656849717bdc3e94b4573a97 /source/blender/editors/render/render_preview.c | |
parent | 45897f12f8c35a455d5a33dbb9a8c0589d04e8b9 (diff) |
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.
Diffstat (limited to 'source/blender/editors/render/render_preview.c')
-rw-r--r-- | source/blender/editors/render/render_preview.c | 6 |
1 files changed, 6 insertions, 0 deletions
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; |