Cycles: tweaks to properties and nodes

* Passes renamed to samples
* Camera lens radius renamed to aperature size/blades/rotation
* Glass and fresnel nodes input is now index of refraction
* Glossy and velvet fresnel socket removed
* Mix/add closure node renamed to mix/add shader node
* Blend weight node added for shader mixing weights

There is some version patching code for reading existing files, but it's not
perfect, so shaders may work a bit different.

6 files changed, 30 insertions, 30 deletions

diff --git a/intern/cycles/device/device.cpp b/intern/cycles/device/device.cpp
index 6ba50154dac..f43ccffe461 100644
--- a/intern/cycles/device/device.cpp
+++ b/intern/cycles/device/device.cpp
@@ -36,7 +36,7 @@ CCL_NAMESPACE_BEGIN
 
 DeviceTask::DeviceTask(Type type_)
 : type(type_), x(0), y(0), w(0), h(0), rng_state(0), rgba(0), buffer(0),
-  pass(0), resolution(0),
+  sample(0), resolution(0),
   displace_input(0), displace_offset(0), displace_x(0), displace_w(0)
 {
 }
diff --git a/intern/cycles/device/device.h b/intern/cycles/device/device.h
index aa9cb9eb8f4..0b3c66dbb2c 100644
--- a/intern/cycles/device/device.h
+++ b/intern/cycles/device/device.h
@@ -58,7 +58,7 @@ public:
 	device_ptr rng_state;
 	device_ptr rgba;
 	device_ptr buffer;
-	int pass;
+	int sample;
 	int resolution;
 
 	device_ptr displace_input;
diff --git a/intern/cycles/device/device_cpu.cpp b/intern/cycles/device/device_cpu.cpp
index 3a3ae685395..2409cc65998 100644
--- a/intern/cycles/device/device_cpu.cpp
+++ b/intern/cycles/device/device_cpu.cpp
@@ -152,7 +152,7 @@ public:
 
 		for(int y = task.y; y < task.y + task.h; y++) {
 			for(int x = task.x; x < task.x + task.w; x++)
-				kernel_cpu_path_trace(kg, (float4*)task.buffer, (unsigned int*)task.rng_state, task.pass, x, y);
+				kernel_cpu_path_trace(kg, (float4*)task.buffer, (unsigned int*)task.rng_state, task.sample, x, y);
 
 			if(tasks.worker_cancel())
 				break;
@@ -168,7 +168,7 @@ public:
 	{
 		for(int y = task.y; y < task.y + task.h; y++) {
 			for(int x = task.x; x < task.x + task.w; x++)
-				kernel_cpu_tonemap(kg, (uchar4*)task.rgba, (float4*)task.buffer, task.pass, task.resolution, x, y);
+				kernel_cpu_tonemap(kg, (uchar4*)task.rgba, (float4*)task.buffer, task.sample, task.resolution, x, y);
 		}
 	}
 
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp
index 7fc0afce1ac..3773dda7631 100644
--- a/intern/cycles/device/device_cuda.cpp
+++ b/intern/cycles/device/device_cuda.cpp
@@ -455,11 +455,11 @@ public:
 		cuda_assert(cuParamSetv(cuPathTrace, offset, &d_rng_state, sizeof(d_rng_state)))
 		offset += sizeof(d_rng_state);
 
-		int pass = task.pass;
-		offset = cuda_align_up(offset, __alignof(pass));
+		int sample = task.sample;
+		offset = cuda_align_up(offset, __alignof(sample));
 
-		cuda_assert(cuParamSeti(cuPathTrace, offset, task.pass))
-		offset += sizeof(task.pass);
+		cuda_assert(cuParamSeti(cuPathTrace, offset, task.sample))
+		offset += sizeof(task.sample);
 
 		cuda_assert(cuParamSeti(cuPathTrace, offset, task.x))
 		offset += sizeof(task.x);
@@ -513,11 +513,11 @@ public:
 		cuda_assert(cuParamSetv(cuFilmConvert, offset, &d_buffer, sizeof(d_buffer)))
 		offset += sizeof(d_buffer);
 
-		int pass = task.pass;
-		offset = cuda_align_up(offset, __alignof(pass));
+		int sample = task.sample;
+		offset = cuda_align_up(offset, __alignof(sample));
 
-		cuda_assert(cuParamSeti(cuFilmConvert, offset, task.pass))
-		offset += sizeof(task.pass);
+		cuda_assert(cuParamSeti(cuFilmConvert, offset, task.sample))
+		offset += sizeof(task.sample);
 
 		cuda_assert(cuParamSeti(cuFilmConvert, offset, task.resolution))
 		offset += sizeof(task.resolution);
diff --git a/intern/cycles/device/device_network.cpp b/intern/cycles/device/device_network.cpp
index 0feba34f713..af7d90478cf 100644
--- a/intern/cycles/device/device_network.cpp
+++ b/intern/cycles/device/device_network.cpp
@@ -178,22 +178,22 @@ public:
 #endif
 	}
 
-	void path_trace(int x, int y, int w, int h, device_ptr buffer, device_ptr rng_state, int pass)
+	void path_trace(int x, int y, int w, int h, device_ptr buffer, device_ptr rng_state, int sample)
 	{
 #if 0
 		RPCSend snd(socket, "path_trace");
 
-		snd.archive & x & y & w & h & buffer & rng_state & pass;
+		snd.archive & x & y & w & h & buffer & rng_state & sample;
 		snd.write();
 #endif
 	}
 
-	void tonemap(int x, int y, int w, int h, device_ptr rgba, device_ptr buffer, int pass, int resolution)
+	void tonemap(int x, int y, int w, int h, device_ptr rgba, device_ptr buffer, int sample, int resolution)
 	{
 #if 0
 		RPCSend snd(socket, "tonemap");
 
-		snd.archive & x & y & w & h & rgba & buffer & pass & resolution;
+		snd.archive & x & y & w & h & rgba & buffer & sample & resolution;
 		snd.write();
 #endif
 	}
@@ -201,9 +201,9 @@ public:
 	void task_add(DeviceTask& task)
 	{
 		if(task.type == DeviceTask::TONEMAP)
-			tonemap(task.x, task.y, task.w, task.h, task.rgba, task.buffer, task.pass, task.resolution);
+			tonemap(task.x, task.y, task.w, task.h, task.rgba, task.buffer, task.sample, task.resolution);
 		else if(task.type == DeviceTask::PATH_TRACE)
-			path_trace(task.x, task.y, task.w, task.h, task.buffer, task.rng_state, task.pass);
+			path_trace(task.x, task.y, task.w, task.h, task.buffer, task.rng_state, task.sample);
 	}
 
 	void task_wait()
@@ -355,20 +355,20 @@ void Device::server_run()
 #if 0
 					device_ptr buffer, rng_state;
 					int x, y, w, h;
-					int pass;
+					int sample;
 
-					*rcv.archive & x & y & w & h & buffer & rng_state & pass;
-					path_trace(x, y, w, h, buffer, rng_state, pass);
+					*rcv.archive & x & y & w & h & buffer & rng_state & sample;
+					path_trace(x, y, w, h, buffer, rng_state, sample);
 #endif
 				}
 				else if(rcv.name == "tonemap") {
 #if 0
 					device_ptr rgba, buffer;
 					int x, y, w, h;
-					int pass, resolution;
+					int sample, resolution;
 
-					*rcv.archive & x & y & w & h & rgba & buffer & pass & resolution;
-					tonemap(x, y, w, h, rgba, buffer, pass, resolution);
+					*rcv.archive & x & y & w & h & rgba & buffer & sample & resolution;
+					tonemap(x, y, w, h, rgba, buffer, sample, resolution);
 #endif
 				}
 			}
diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp
index a41238ffe09..a87b12786b1 100644
--- a/intern/cycles/device/device_opencl.cpp
+++ b/intern/cycles/device/device_opencl.cpp
@@ -502,9 +502,9 @@ public:
 		cl_int d_y = task.y;
 		cl_int d_w = task.w;
 		cl_int d_h = task.h;
-		cl_int d_pass = task.pass;
+		cl_int d_sample = task.sample;
 
-		/* pass arguments */
+		/* sample arguments */
 		int narg = 0;
 		ciErr = 0;
 
@@ -516,7 +516,7 @@ public:
 	ciErr |= set_kernel_arg_mem(ckPathTraceKernel, &narg, #name);
 #include "kernel_textures.h"
 
-		ciErr |= clSetKernelArg(ckPathTraceKernel, narg++, sizeof(d_pass), (void*)&d_pass);
+		ciErr |= clSetKernelArg(ckPathTraceKernel, narg++, sizeof(d_sample), (void*)&d_sample);
 		ciErr |= clSetKernelArg(ckPathTraceKernel, narg++, sizeof(d_x), (void*)&d_x);
 		ciErr |= clSetKernelArg(ckPathTraceKernel, narg++, sizeof(d_y), (void*)&d_y);
 		ciErr |= clSetKernelArg(ckPathTraceKernel, narg++, sizeof(d_w), (void*)&d_w);
@@ -575,10 +575,10 @@ public:
 		cl_int d_y = task.y;
 		cl_int d_w = task.w;
 		cl_int d_h = task.h;
-		cl_int d_pass = task.pass;
+		cl_int d_sample = task.sample;
 		cl_int d_resolution = task.resolution;
 
-		/* pass arguments */
+		/* sample arguments */
 		int narg = 0;
 		ciErr = 0;
 
@@ -590,7 +590,7 @@ public:
 	ciErr |= set_kernel_arg_mem(ckFilmConvertKernel, &narg, #name);
 #include "kernel_textures.h"
 
-		ciErr |= clSetKernelArg(ckFilmConvertKernel, narg++, sizeof(d_pass), (void*)&d_pass);
+		ciErr |= clSetKernelArg(ckFilmConvertKernel, narg++, sizeof(d_sample), (void*)&d_sample);
 		ciErr |= clSetKernelArg(ckFilmConvertKernel, narg++, sizeof(d_resolution), (void*)&d_resolution);
 		ciErr |= clSetKernelArg(ckFilmConvertKernel, narg++, sizeof(d_x), (void*)&d_x);
 		ciErr |= clSetKernelArg(ckFilmConvertKernel, narg++, sizeof(d_y), (void*)&d_y);