Merge branch 'master' into temp-gpencil-maskingtemp-gpencil-masking

 Conflicts:
	source/blender/blenloader/intern/versioning_300.c

1 files changed, 6 insertions, 3 deletions

diff --git a/intern/cycles/render/svm.h b/intern/cycles/render/svm.h
index a4ca68e1d8d..d23ff3e2a47 100644
--- a/intern/cycles/render/svm.h
+++ b/intern/cycles/render/svm.h
@@ -44,10 +44,13 @@ class SVMShaderManager : public ShaderManager {
   SVMShaderManager();
   ~SVMShaderManager();
 
-  void reset(Scene *scene);
+  void reset(Scene *scene) override;
 
-  void device_update(Device *device, DeviceScene *dscene, Scene *scene, Progress &progress);
-  void device_free(Device *device, DeviceScene *dscene, Scene *scene);
+  void device_update_specific(Device *device,
+                              DeviceScene *dscene,
+                              Scene *scene,
+                              Progress &progress) override;
+  void device_free(Device *device, DeviceScene *dscene, Scene *scene) override;
 
  protected:
   void device_update_shader(Scene *scene,