diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-02-06 15:06:23 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-06 15:06:23 +0300 |
| commit | 5376c739f5bf4029e0a32946e9945a732feba217 (patch) | |
| tree | b3494e69541d22edf5b971106b532e3a2a2577cd /intern/cycles/device/device.h | |
| parent | 98dcd33238e44984d31d96e2ffd0191a5d1cf7b6 (diff) | |
| parent | 486e2547eea3f12bfde70f2526dde08f39a8722b (diff) | |
Merge branch 'master' into blender2.8
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 721898458fc..be4b9a7e972 100644 --- a/intern/cycles/device/device.h +++ b/intern/cycles/device/device.h @@ -301,7 +301,7 @@ public: Stats &stats; /* memory alignment */ - virtual int mem_address_alignment() { return MIN_ALIGNMENT_CPU_DATA_TYPES; } + virtual int mem_sub_ptr_alignment() { return MIN_ALIGNMENT_CPU_DATA_TYPES; } /* constant memory */ virtual void const_copy_to(const char *name, void *host, size_t size) = 0; |