blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Temporarily disable material preview (T51796 workaround) 

This stops the memory breakage caused by the material preview jobs,
to enable the new hair drawing implementation.

(This should be reverted once T51796 is actually fixed!)
This commit is contained in:
Luca Rood 2017-06-14 12:29:32 +02:00
parent 28af03c1c2
commit 0d9611718d
Notes: blender-bot 2023-02-14 08:10:10 +01:00 
Referenced by commit 45720922f7, Revert "Temporarily disable material preview (T51796 workaround)"
1 changed files with 6 additions and 0 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,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;