blender
/
blender
128
396
Fork 569
Code Issues 6.2k Pull Requests 755 Projects 19 Wiki Activity

Revert "Temporarily disable material preview (T51796 workaround)" 

This reverts commit 0d9611718d.

The preview issues have been solved by CoW commit
802027f3f8
This commit is contained in:
Luca Rood 2017-06-23 11:55:04 +02:00
parent a764044ccc
commit 45720922f7
Notes: blender-bot 2023-02-14 07:30:31 +01:00 
Referenced by commit 6df053e527, Revert "Revert "Temporarily disable material preview (T51796 workaround)""
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/editors/render/render_preview.c
View File

@ -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;