Commit: 193425ce1db168735c3d6532d9582e5f1aacdc00 Author: Ankit Meel Date: Wed May 12 10:27:37 2021 +0530 Branches: master https://developer.blender.org/rB193425ce1db168735c3d6532d9582e5f1aacdc00
Cycles: fix inconsistent-missing-override warnings LLVM Clang 13, macOS. Reviewed By: brecht Differential Revision: https://developer.blender.org/D11207 =================================================================== M intern/cycles/render/osl.h M intern/cycles/render/svm.h =================================================================== 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, _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
