Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Rood <dev@lucarood.com>2017-06-14 13:29:32 +0300
committerLuca Rood <dev@lucarood.com>2017-06-14 15:03:58 +0300
commit0d9611718d89636d0d407555252b3a6a1d7ef2f9 (patch)
treee2d595e81e520e261bf2895de8f751adad7f51a9 /source/blender/editors
parent28af03c1c20bdeefb2aa264af9577b3508c4571d (diff)
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!)
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/render/render_preview.c6
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 ae938c3fa30..1f1924ef53c 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;