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/object/object_modifier.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/object/object_modifier.c')
| -rw-r--r-- | source/blender/editors/object/object_modifier.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index 556ed44520c..47f5a285374 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -2114,7 +2114,7 @@ static int ocean_bake_exec(bContext *C, wmOperator *op) int f, cfra, i = 0; int free = RNA_boolean_get(op->ptr, "free"); - wmJob *steve; + wmJob *wm_job; OceanBakeJob *oj; if (!omd) @@ -2181,18 +2181,18 @@ static int ocean_bake_exec(bContext *C, wmOperator *op) scene->r.cfra = cfra; /* setup job */ - steve = WM_jobs_get(CTX_wm_manager(C), CTX_wm_window(C), scene, "Ocean Simulation", - WM_JOB_PROGRESS, WM_JOB_TYPE_OBJECT_SIM_OCEAN); + wm_job = WM_jobs_get(CTX_wm_manager(C), CTX_wm_window(C), scene, "Ocean Simulation", + WM_JOB_PROGRESS, WM_JOB_TYPE_OBJECT_SIM_OCEAN); oj = MEM_callocN(sizeof(OceanBakeJob), "ocean bake job"); oj->ocean = ocean; oj->och = och; oj->omd = omd; - WM_jobs_customdata_set(steve, oj, oceanbake_free); - WM_jobs_timer(steve, 0.1, NC_OBJECT | ND_MODIFIER, NC_OBJECT | ND_MODIFIER); - WM_jobs_callbacks(steve, oceanbake_startjob, NULL, NULL, oceanbake_endjob); + WM_jobs_customdata_set(wm_job, oj, oceanbake_free); + WM_jobs_timer(wm_job, 0.1, NC_OBJECT | ND_MODIFIER, NC_OBJECT | ND_MODIFIER); + WM_jobs_callbacks(wm_job, oceanbake_startjob, NULL, NULL, oceanbake_endjob); - WM_jobs_start(CTX_wm_manager(C), steve); + WM_jobs_start(CTX_wm_manager(C), wm_job); |