Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brecht@blender.org>2020-06-10 21:34:01 +0300
committerBrecht Van Lommel <brecht@blender.org>2020-06-10 21:34:01 +0300
commitfaf5f7b63d52f22b867619f4b38e5346fee56b37 (patch)
tree00fda6d0320e869eeea000cc959a1bff9244f304 /intern/cycles/device/device_multi.cpp
parent63930c41bc3abf784d29091246b952a5c9d848b3 (diff)
Cleanup: fix compiler warning after recent changes
It would be good to use override for all member functions, but doing it for only somes generates compiler warning.
Diffstat (limited to 'intern/cycles/device/device_multi.cpp')
-rw-r--r--intern/cycles/device/device_multi.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/device/device_multi.cpp b/intern/cycles/device/device_multi.cpp
index ef1687ddd3a..020b9e10e60 100644
--- a/intern/cycles/device/device_multi.cpp
+++ b/intern/cycles/device/device_multi.cpp
@@ -242,7 +242,7 @@ class MultiDevice : public Device {
return devices.front().device->osl_memory();
}
- bool is_resident(device_ptr key, Device *sub_device) override
+ bool is_resident(device_ptr key, Device *sub_device)
{
foreach (SubDevice &sub, devices) {
if (sub.device == sub_device) {