blender
/
blender
135
403
Fork 585
Code Issues 6.3k Pull Requests 760 Projects 19 Wiki Activity

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 45720922f7.
This commit is contained in:
Sergey Sharybin 2017-07-10 15:43:04 +02:00
parent 45897f12f8
commit 6df053e527
Notes: blender-bot 2023-02-13 12:01:22 +01:00 
Referenced by commit bb0bdc6ce2, Revert "Revert "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;