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_network.cpp | |
parent | 0af22625c9f9357e873160d265b9eae4a43a549d (diff) | |
parent | 9d2397c710af9180e7e2ec6db42e8513390b4ab1 (diff) |
Merge branch 'blender2.7'
Diffstat (limited to 'intern/cycles/device/device_network.cpp')
-rw-r--r-- | intern/cycles/device/device_network.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/intern/cycles/device/device_network.cpp b/intern/cycles/device/device_network.cpp index 91628490b51..6736480e95a 100644 --- a/intern/cycles/device/device_network.cpp +++ b/intern/cycles/device/device_network.cpp @@ -308,7 +308,6 @@ void device_network_info(vector<DeviceInfo>& devices) info.num = 0; /* todo: get this info from device */ - info.advanced_shading = true; info.has_volume_decoupled = false; info.has_osl = false; |