diff options
| author | Hans Goudey <h.goudey@me.com> | 2021-11-06 00:33:08 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2021-11-06 00:33:08 +0300 |
| commit | 9e611c5616aa27c43ed067d184f94e6e9c9f5ffc (patch) | |
| tree | cd28326cdcf24ae83f2ca64bc2b1ad1776101c02 /intern/cycles/device/device.h | |
| parent | f0bc7f3261b823fe4efbe802ec6a2f3471bedd47 (diff) | |
| parent | 9be49a10699417aa5902144d99ff70e5e1fc6af8 (diff) | |
Merge branch 'blender-v3.0-release'
Diffstat (limited to 'intern/cycles/device/device.h')
| -rw-r--r-- | intern/cycles/device/device.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/device/device.h b/intern/cycles/device/device.h index fdd78b3aa4c..a7d47f23d54 100644 --- a/intern/cycles/device/device.h +++ b/intern/cycles/device/device.h @@ -178,7 +178,7 @@ class Device { * These may not be used on GPU or multi-devices. */ /* Get CPU kernel functions for native instruction set. */ - virtual const CPUKernels *get_cpu_kernels() const; + static const CPUKernels &get_cpu_kernels(); /* Get kernel globals to pass to kernels. */ virtual void get_cpu_kernel_thread_globals( vector<CPUKernelThreadGlobals> & /*kernel_thread_globals*/); |