diff options
| author | Martijn Berger <martijn.berger@gmail.com> | 2015-08-09 16:31:32 +0300 |
|---|---|---|
| committer | Martijn Berger <martijn.berger@gmail.com> | 2015-08-09 16:31:32 +0300 |
| commit | ded665a2c9950e3b5a400ecf5b60cdc75d5f7f9a (patch) | |
| tree | 4bd18b068a71ce4e829e22d76ff3196d63f23ab2 /intern/cycles/device/device_network.cpp | |
| parent | 63265fd0c3e9c894d0f317e942ec20569defa978 (diff) | |
Compile fix cycles network. This code is crusty and not super
functional. But is should compile.
Diffstat (limited to 'intern/cycles/device/device_network.cpp')
| -rw-r--r-- | intern/cycles/device/device_network.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/device/device_network.cpp b/intern/cycles/device/device_network.cpp index d1f941ad9f2..d4da3047110 100644 --- a/intern/cycles/device/device_network.cpp +++ b/intern/cycles/device/device_network.cpp @@ -580,7 +580,7 @@ protected: rcv.read(name); rcv.read(mem); rcv.read(interpolation); - rcv.read(extension); + rcv.read(extension_typr); lock.unlock(); client_pointer = mem.device_pointer; @@ -596,7 +596,7 @@ protected: rcv.read_buffer((uint8_t*)mem.data_pointer, data_size); - device->tex_alloc(name.c_str(), mem, interpolation, extension); + device->tex_alloc(name.c_str(), mem, interpolation, extension_typr); pointer_mapping_insert(client_pointer, mem.device_pointer); } |