diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-11-29 04:55:58 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-29 04:55:58 +0300 |
| commit | 9893fee4e6ce5949c8d3274b2746855b3095258f (patch) | |
| tree | 973d8b46af8d83705ecc97c21f12bbb1799af2a3 /intern/cycles/device/device.h | |
| parent | 535984a848865c07a39610b32a53432d1a078c59 (diff) | |
| parent | 140f2209b61d637411cfbc22c755703c6220278f (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, 2 insertions, 0 deletions
diff --git a/intern/cycles/device/device.h b/intern/cycles/device/device.h index 5d1308c3030..c620914aab4 100644 --- a/intern/cycles/device/device.h +++ b/intern/cycles/device/device.h @@ -60,6 +60,7 @@ public: bool has_volume_decoupled; /* Decoupled volume shading. */ bool has_osl; /* Support Open Shading Language. */ bool use_split_kernel; /* Use split or mega kernel. */ + bool has_profiling; /* Supports runtime collection of profiling info. */ int cpu_threads; vector<DeviceInfo> multi_devices; @@ -75,6 +76,7 @@ public: has_volume_decoupled = false; has_osl = false; use_split_kernel = false; + has_profiling = false; } bool operator==(const DeviceInfo &info) { |