diff options
| author | Ankit Meel <ankitjmeel@gmail.com> | 2021-05-12 07:57:37 +0300 |
|---|---|---|
| committer | Ankit Meel <ankitjmeel@gmail.com> | 2021-05-12 07:57:37 +0300 |
| commit | 193425ce1db168735c3d6532d9582e5f1aacdc00 (patch) | |
| tree | 999d166c940ccafb4a971091c78a1dcb0e952e79 /intern/cycles | |
| parent | 9a6fd6999329f8e8c60493d0b259fd7052e014aa (diff) | |
Cycles: fix inconsistent-missing-override warnings
LLVM Clang 13, macOS.
Reviewed By: brecht
Differential Revision: https://developer.blender.org/D11207
Diffstat (limited to 'intern/cycles')
| -rw-r--r-- | intern/cycles/render/osl.h | 6 | ||||
| -rw-r--r-- | intern/cycles/render/svm.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/intern/cycles/render/osl.h b/intern/cycles/render/osl.h index c9eaf26e70a..f6aa98d867a 100644 --- a/intern/cycles/render/osl.h +++ b/intern/cycles/render/osl.h @@ -72,9 +72,9 @@ class OSLShaderManager : public ShaderManager { static void free_memory(); - void reset(Scene *scene); + void reset(Scene *scene) override; - bool use_osl() + bool use_osl() override { return true; } @@ -83,7 +83,7 @@ class OSLShaderManager : public ShaderManager { DeviceScene *dscene, Scene *scene, Progress &progress) override; - void device_free(Device *device, DeviceScene *dscene, Scene *scene); + void device_free(Device *device, DeviceScene *dscene, Scene *scene) override; /* osl compile and query */ static bool osl_compile(const string &inputfile, const string &outputfile); diff --git a/intern/cycles/render/svm.h b/intern/cycles/render/svm.h index 85b4b9c419f..d23ff3e2a47 100644 --- a/intern/cycles/render/svm.h +++ b/intern/cycles/render/svm.h @@ -44,13 +44,13 @@ class SVMShaderManager : public ShaderManager { SVMShaderManager(); ~SVMShaderManager(); - void reset(Scene *scene); + void reset(Scene *scene) override; void device_update_specific(Device *device, DeviceScene *dscene, Scene *scene, Progress &progress) override; - void device_free(Device *device, DeviceScene *dscene, Scene *scene); + void device_free(Device *device, DeviceScene *dscene, Scene *scene) override; protected: void device_update_shader(Scene *scene, |