Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2015-08-10 18:24:14 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-08-10 18:24:14 +0300
commit7b467a6feaf820b1cbd9d590c67c189047931377 (patch)
tree10d93b98bea082c84bd88e4c504f9f90b5868283
parent3c77822f96e6ef6972c3a87467a4941d7a114744 (diff)
Cycles: Fix for typo in previous commit
-rw-r--r--intern/cycles/device/device_network.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/device/device_network.cpp b/intern/cycles/device/device_network.cpp
index d4da3047110..afa35224aba 100644
--- a/intern/cycles/device/device_network.cpp
+++ b/intern/cycles/device/device_network.cpp
@@ -574,13 +574,13 @@ protected:
network_device_memory mem;
string name;
InterpolationType interpolation;
- ExtensionType extension_typr;
+ ExtensionType extension_type;
device_ptr client_pointer;
rcv.read(name);
rcv.read(mem);
rcv.read(interpolation);
- rcv.read(extension_typr);
+ rcv.read(extension_type);
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_typr);
+ device->tex_alloc(name.c_str(), mem, interpolation, extension_type);
pointer_mapping_insert(client_pointer, mem.device_pointer);
}