diff options
| author | Ton Roosendaal <ton@blender.org> | 2011-03-11 20:59:40 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2011-03-11 20:59:40 +0300 |
| commit | 44692c70ae9cc8f5f1dbb2bf3de347cbd611d144 (patch) | |
| tree | 0f42fa594db312afbd7f0be9fc2f1e7759b0e3cb /source/blender/editors/render | |
| parent | 719bf206b4b79c06de966b6b4a2c3a06a04c713c (diff) | |
Bugfix, irc report:
Pressing ESC on material icon preview changes made it stop updating
the icons. Was caused by default 'break' callback testing ESC and
not resetting it. Now it uses same break callback as other previews.
Diffstat (limited to 'source/blender/editors/render')
| -rw-r--r-- | source/blender/editors/render/render_preview.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c index a1ef042f8e4..73d7fc2abee 100644 --- a/source/blender/editors/render/render_preview.c +++ b/source/blender/editors/render/render_preview.c @@ -1053,8 +1053,10 @@ static void shader_preview_render(ShaderPreview *sp, ID *id, int split, int firs /* callbacs are cleared on GetRender() */ if(ELEM(sp->pr_method, PR_BUTS_RENDER, PR_NODE_RENDER)) { RE_display_draw_cb(re, sp, shader_preview_draw); - RE_test_break_cb(re, sp, shader_preview_break); } + /* set this for all previews, default is react to G.afbreek still */ + RE_test_break_cb(re, sp, shader_preview_break); + /* lens adjust */ oldlens= ((Camera *)sce->camera->data)->lens; if(sizex > sp->sizey) |