diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2018-01-19 17:46:23 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2018-01-19 17:46:23 +0300 |
| commit | d9858d5897efbf0e41ebe61c2aaabf451c33d6ad (patch) | |
| tree | 96661f5f7e5309ea6d5e9a803af77112ed039d89 /intern/cycles/device/device.h | |
| parent | 7866870a9a58ce086f4af5dc7dc7bc8acf1e333c (diff) | |
| parent | edf053ff635e782d09b64d205fadfca3cce79de4 (diff) | |
Merge remote-tracking branch 'origin/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 70f56165f8a..d6ae01d28be 100644 --- a/intern/cycles/device/device.h +++ b/intern/cycles/device/device.h @@ -299,7 +299,7 @@ public: Stats &stats; /* memory alignment */ - virtual int mem_address_alignment() { return 16; } + virtual int mem_address_alignment() { return MIN_ALIGNMENT_CPU_DATA_TYPES; } /* constant memory */ virtual void const_copy_to(const char *name, void *host, size_t size) = 0; |