Cycles / Non-Progressive integrator:

* Code cleanup, to avoid separate code for CPU and GPU.

intern/cycles/kernel/kernel_shader.h

@@ -956,13 +956,9 @@ __device void shader_merge_closures(KernelGlobals *kg, ShaderData *sd)
 
 				int size = sd->num_closure - (j+1);
 				if(size > 0) {
-#ifdef __KERNEL_GPU__
 					for(int k = 0; k < size; k++) {
 						scj[k] = scj[k+1];
 					}
-#else
-					memmove(scj, scj+1, size*sizeof(ShaderClosure));
-#endif
 				}
 
 				sd->num_closure--;