diff options
author | Ton Roosendaal <ton@blender.org> | 2009-01-22 18:46:35 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2009-01-22 18:46:35 +0300 |
commit | d5f69e85522fceb4847938ac815fcefe3959727b (patch) | |
tree | 83795bc64a2aa9242f1d4edf38e72e97b3307a5f /source/blender/editors/preview | |
parent | 9cc59fb0c329bb788defe9c56b69d0919caaba96 (diff) |
2.5
- warning cleanup (wrong casts, unused vars, missing protos)
- removed old cruft from node_edit.c
- cleaned wm_jobs.c a bit
Diffstat (limited to 'source/blender/editors/preview')
-rw-r--r-- | source/blender/editors/preview/previewrender.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/source/blender/editors/preview/previewrender.c b/source/blender/editors/preview/previewrender.c index 20bc49d7029..7fbac0a77c2 100644 --- a/source/blender/editors/preview/previewrender.c +++ b/source/blender/editors/preview/previewrender.c @@ -996,7 +996,6 @@ static void shader_preview_startjob(void *customdata, short *stop, short *do_upd { ShaderPreview *sp= customdata; Render *re; - RenderStats *rstats; Scene *sce; char name [32]; @@ -1034,12 +1033,6 @@ static void shader_preview_startjob(void *customdata, short *stop, short *do_upd RE_test_break_cb(re, sp, shader_preview_break); } - /* enforce preview image clear */ -// if(GS(sp->id->name)==ID_MA) { -// Material *ma= (Material *)sp->id; -// ntreeClearPreview(ma->nodetree); -// } - /* entire cycle for render engine */ RE_SetCamera(re, sce->camera); RE_Database_FromScene(re, sce, 1); @@ -1054,17 +1047,6 @@ static void shader_preview_startjob(void *customdata, short *stop, short *do_upd // ri->rect= MEM_mallocN(sizeof(int)*ri->pr_rectx*ri->pr_recty, "BIF_previewrender"); //RE_ResultGet32(re, ri->rect); } - else { - rstats= RE_GetStats(re); - - if(rstats->totpart==rstats->partsdone && rstats->partsdone) { - // allqueues - } - else { - // if(pr_method==PR_DRAW_RENDER && qtest()) - // addafterqueue(area->win, RENDERPREVIEW, 1); - } - } /* unassign the pointers, reset vars */ preview_prepare_scene(sp->scene, GS(sp->id->name), NULL); @@ -1101,7 +1083,7 @@ void ED_preview_shader_job(const bContext *C, void *owner, ID *id, int sizex, in /* setup job */ WM_jobs_customdata(steve, sp, shader_preview_free); WM_jobs_timer(steve, 0.1, NC_MATERIAL); - WM_jobs_callbacks(steve, shader_preview_startjob, NULL, shader_preview_update); + WM_jobs_callbacks(steve, shader_preview_startjob, shader_preview_update); WM_jobs_start(steve); } |