diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-08-15 14:03:29 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-08-15 14:03:29 +0400 |
| commit | 15bd03f95806a24854f50aff4f4f8da09938d301 (patch) | |
| tree | 6e493281c61339db9a984e70a69b09d5974509e3 /source/blender/editors/space_node/node_edit.c | |
| parent | 97859e870902305642783a705e1b12f19a2aaf76 (diff) | |
fix for missing change to fluidsim from last commit and name jobs a more useful name - 'wm_job'.
Diffstat (limited to 'source/blender/editors/space_node/node_edit.c')
| -rw-r--r-- | source/blender/editors/space_node/node_edit.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c index 6ef466ba1c3..d34c5f16afa 100644 --- a/source/blender/editors/space_node/node_edit.c +++ b/source/blender/editors/space_node/node_edit.c @@ -173,7 +173,7 @@ static void compo_startjob(void *cjv, short *stop, short *do_update, float *prog */ void ED_node_composite_job(const bContext *C, struct bNodeTree *nodetree, Scene *scene_owner) { - wmJob *steve; + wmJob *wm_job; CompoJob *cj; /* to fix bug: [#32272] */ @@ -181,8 +181,8 @@ void ED_node_composite_job(const bContext *C, struct bNodeTree *nodetree, Scene return; } - steve = WM_jobs_get(CTX_wm_manager(C), CTX_wm_window(C), scene_owner, "Compositing", - WM_JOB_EXCL_RENDER | WM_JOB_PROGRESS, WM_JOB_TYPE_COMPOSITE); + wm_job = WM_jobs_get(CTX_wm_manager(C), CTX_wm_window(C), scene_owner, "Compositing", + WM_JOB_EXCL_RENDER | WM_JOB_PROGRESS, WM_JOB_TYPE_COMPOSITE); cj = MEM_callocN(sizeof(CompoJob), "compo job"); /* customdata for preview thread */ @@ -190,11 +190,11 @@ void ED_node_composite_job(const bContext *C, struct bNodeTree *nodetree, Scene cj->ntree = nodetree; /* setup job */ - WM_jobs_customdata_set(steve, cj, compo_freejob); - WM_jobs_timer(steve, 0.1, NC_SCENE, NC_SCENE | ND_COMPO_RESULT); - WM_jobs_callbacks(steve, compo_startjob, compo_initjob, compo_updatejob, NULL); + WM_jobs_customdata_set(wm_job, cj, compo_freejob); + WM_jobs_timer(wm_job, 0.1, NC_SCENE, NC_SCENE | ND_COMPO_RESULT); + WM_jobs_callbacks(wm_job, compo_startjob, compo_initjob, compo_updatejob, NULL); - WM_jobs_start(CTX_wm_manager(C), steve); + WM_jobs_start(CTX_wm_manager(C), wm_job); } /* ***************************************** */ |