From cfbd6cf154bbc653422f30b2bf8077545f5fb99c Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 9 Sep 2011 12:04:39 +0000 Subject: 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'intern/cycles/blender/blender_python.cpp') diff --git a/intern/cycles/blender/blender_python.cpp b/intern/cycles/blender/blender_python.cpp index b40f5206fea..1026d420c02 100644 --- a/intern/cycles/blender/blender_python.cpp +++ b/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; -- cgit v1.2.3