[Bf-blender-cvs] [7b467a6] master: Cycles: Fix for typo in previous commit

Sergey Sharybin noreply at git.blender.org
Mon Aug 10 17:27:08 CEST 2015


Commit: 7b467a6feaf820b1cbd9d590c67c189047931377
Author: Sergey Sharybin
Date:   Mon Aug 10 17:24:14 2015 +0200
Branches: master
https://developer.blender.org/rB7b467a6feaf820b1cbd9d590c67c189047931377

Cycles: Fix for typo in previous commit

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

M	intern/cycles/device/device_network.cpp

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

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




More information about the Bf-blender-cvs mailing list