[Bf-blender-cvs] [ded665a] master: Compile fix cycles network. This code is crusty and not super functional. But is should compile.

[Martijn Berger]

Commit: ded665a2c9950e3b5a400ecf5b60cdc75d5f7f9a
Author: Martijn Berger
Date:   Sun Aug 9 15:31:32 2015 +0200
Branches: master
https://developer.blender.org/rBded665a2c9950e3b5a400ecf5b60cdc75d5f7f9a

Compile fix cycles network. This code is crusty and not super
functional. But is should compile.

===================================================================

M	intern/cycles/device/device_network.cpp

===================================================================

diff --git a/intern/cycles/device/device_network.cpp b/intern/cycles/device/device_network.cpp
index d1f941a..d4da304 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);
 		}