diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-04-04 10:54:50 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-04-04 10:54:50 +0300 |
| commit | eaf8608ba5e949f0bc81a57bc54822d4283a312a (patch) | |
| tree | d9919e7ece856389778a8d14532688615f760235 /intern/cycles/device | |
| parent | cd6daea7d32d306a427e97427cb135d1589cc309 (diff) | |
| parent | 4674e02562637f36a9900bff5f5f4acc9aff482d (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/device')
| -rw-r--r-- | intern/cycles/device/opencl/opencl_util.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/device/opencl/opencl_util.cpp b/intern/cycles/device/opencl/opencl_util.cpp index a776f48b5e9..78ed401bff5 100644 --- a/intern/cycles/device/opencl/opencl_util.cpp +++ b/intern/cycles/device/opencl/opencl_util.cpp @@ -633,7 +633,7 @@ bool OpenCLInfo::device_supported(const string& platform_name, } const char *blacklist[] = { /* GCN 1 */ - "Tahiti", "Pitcairn", "Capeverde", "Oland", + "Tahiti", "Pitcairn", "Capeverde", "Oland", "Hainan", NULL }; for(int i = 0; blacklist[i] != NULL; i++) { |