diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-11-25 00:01:30 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-25 00:01:53 +0300 |
| commit | 059c119719e04283808d3c7076886e1a58874f6b (patch) | |
| tree | 5296776b81111ef62e33687d4a9b4c6ab5e297ff /intern/cycles/render | |
| parent | fa0fcbe4d6ca3f183f02395fe9ba18fb5ea87748 (diff) | |
| parent | e742e0934de6384eeaf271ca4cfe99922ddbe3fb (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/render')
| -rw-r--r-- | intern/cycles/render/scene.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/render/scene.cpp b/intern/cycles/render/scene.cpp index 2241d8d9c69..23233b4e29e 100644 --- a/intern/cycles/render/scene.cpp +++ b/intern/cycles/render/scene.cpp @@ -218,7 +218,7 @@ void Scene::device_update(Device *device_, Progress& progress) object_manager->device_update(device, &dscene, this, progress); if(progress.get_cancel() || device->have_error()) return; - + progress.set_status("Updating Hair Systems"); curve_system_manager->device_update(device, &dscene, this, progress); @@ -248,7 +248,7 @@ void Scene::device_update(Device *device_, Progress& progress) camera->device_update_volume(device, &dscene, this); if(progress.get_cancel() || device->have_error()) return; - + progress.set_status("Updating Lookup Tables"); lookup_tables->device_update(device, &dscene); |