diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2022-11-08 20:13:59 +0300 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2022-11-08 20:13:59 +0300 |
| commit | e59ebfef3c583985553e78492cf8cd07bbe7648e (patch) | |
| tree | 35f31c3b592f40885baf8d8b078844c92bfbabe7 /source/blender/editors/render/render_shading.cc | |
| parent | fe7088c99ff084f7218ab20136d49eb1a1dccd0b (diff) | |
| parent | 4c182aef7ce0e8c26dd2b85c1fa2cd45c2ef64ea (diff) | |
Merge branch 'master' into temp-sculpt-brush-channeltemp-sculpt-brush-channel
Diffstat (limited to 'source/blender/editors/render/render_shading.cc')
| -rw-r--r-- | source/blender/editors/render/render_shading.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/render/render_shading.cc b/source/blender/editors/render/render_shading.cc index 83ce447e8cf..e5c2b9702e5 100644 --- a/source/blender/editors/render/render_shading.cc +++ b/source/blender/editors/render/render_shading.cc @@ -1398,7 +1398,7 @@ static int light_cache_bake_exec(bContext *C, wmOperator *op) light_cache_bake_tag_cache(scene, op); - short stop = 0, do_update; + bool stop = false, do_update; float progress; /* Not actually used. */ EEVEE_lightbake_job(rj, &stop, &do_update, &progress); EEVEE_lightbake_job_data_free(rj); |