Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Compile fix cycles network. This code is crusty and not super

Browse Source 
functional. But is should compile.
This commit is contained in:
Martijn Berger
2015-08-09 15:31:32 +02:00
parent 63265fd0c3
commit ded665a2c9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/device/device_network.cpp
View File

@@ -580,7 +580,7 @@ protected:
rcv.read(name); rcv.read(name);
rcv.read(mem); rcv.read(mem);
rcv.read(interpolation); rcv.read(interpolation);
rcv.read(extension); rcv.read(extension_typr);
lock.unlock(); lock.unlock();
client_pointer = mem.device_pointer; client_pointer = mem.device_pointer;
@@ -596,7 +596,7 @@ protected:
rcv.read_buffer((uint8_t*)mem.data_pointer, data_size); 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); pointer_mapping_insert(client_pointer, mem.device_pointer);
} }