diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-17 14:54:19 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-17 14:54:19 +0300 |
| commit | e69192968616b17709e6a3bd0d2dc59d463c52ba (patch) | |
| tree | 4018a1dc7f631ad340b11c0b738fade9f24d0c6e /intern/cycles/device/device.h | |
| parent | 0af22625c9f9357e873160d265b9eae4a43a549d (diff) | |
| parent | 9d2397c710af9180e7e2ec6db42e8513390b4ab1 (diff) | |
Merge branch 'blender2.7'
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 4db8d10a4aa..aa0a8e434d2 100644 --- a/intern/cycles/device/device.h +++ b/intern/cycles/device/device.h @@ -73,7 +73,6 @@ public: string id; /* used for user preferences, should stay fixed with changing hardware config */ int num; bool display_device; /* GPU is used as a display device. */ - bool advanced_shading; /* Supports full shading system. */ bool has_half_images; /* Support half-float textures. */ bool has_volume_decoupled; /* Decoupled volume shading. */ bool has_osl; /* Support Open Shading Language. */ @@ -89,7 +88,6 @@ public: num = 0; cpu_threads = 0; display_device = false; - advanced_shading = true; has_half_images = false; has_volume_decoupled = false; has_osl = false; |