Cycles:

* OpenCL now only uses GPU/Accelerator devices, it's only confusing if CPU
  device is used, easy to enable in the code for debugging.
* OpenCL kernel binaries are now cached for faster startup after the first
  time compiling.
* CUDA kernels can now be compiled and cached at runtime if the CUDA toolkit
  is installed. This means that even if the build does not have CUDA enabled,
  it's still possible to use it as long as you install the toolkit.

intern/cycles/blender/blender_python.cpp

@@ -28,12 +28,12 @@ CCL_NAMESPACE_BEGIN
 
 static PyObject *init_func(PyObject *self, PyObject *args)
 {
-	const char *path;
+	const char *path, *user_path;
 
-	if(!PyArg_ParseTuple(args, "s", &path))
+	if(!PyArg_ParseTuple(args, "ss", &path, &user_path))
 		return NULL;
 	
-	path_init(path);
+	path_init(path, user_path);
 
 	Py_INCREF(Py_None);
 	return Py_None;