diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-02-18 14:33:05 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-18 14:33:05 +0300 |
| commit | 2bc952fdb6e1474e9e568224a37bcf5cff874aaf (patch) | |
| tree | 8d7c3a99896415392035ba350a606d350b6d5e37 /intern/cycles/device/device.h | |
| parent | 5d3f679013bbbb9f0c7aae47b5653c54266cf7ca (diff) | |
| parent | 7ff3cd26932cbc93068eea4dc7438442216e4ee1 (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, 0 insertions, 2 deletions
diff --git a/intern/cycles/device/device.h b/intern/cycles/device/device.h index be4b9a7e972..31deba2d796 100644 --- a/intern/cycles/device/device.h +++ b/intern/cycles/device/device.h @@ -56,7 +56,6 @@ public: int num; bool display_device; /* GPU is used as a display device. */ bool advanced_shading; /* Supports full shading system. */ - bool has_fermi_limits; /* Fixed number of textures limit. */ bool has_half_images; /* Support half-float textures. */ bool has_volume_decoupled; /* Decoupled volume shading. */ BVHLayoutMask bvh_layout_mask; /* Bitmask of supported BVH layouts. */ @@ -73,7 +72,6 @@ public: cpu_threads = 0; display_device = false; advanced_shading = true; - has_fermi_limits = false; has_half_images = false; has_volume_decoupled = false; bvh_layout_mask = BVH_LAYOUT_NONE; |