diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-07-06 11:18:52 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-06 11:18:52 +0300 |
| commit | de777ad9e69320500bf05d97a7d6d60ba4fd0a93 (patch) | |
| tree | a1141843a3e1df137bbc6490641bedf12a12a8fa /intern/cycles/blender/blender_python.cpp | |
| parent | 6d38d824377c55aaaed7e8283e81a7128bf6f728 (diff) | |
| parent | 1daa20ad9f6f0c433a4e0a97a74e5beb9ea4e2c7 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/blender/blender_python.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_python.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/blender/blender_python.cpp b/intern/cycles/blender/blender_python.cpp index 84b90cb53de..4c199f4838f 100644 --- a/intern/cycles/blender/blender_python.cpp +++ b/intern/cycles/blender/blender_python.cpp @@ -326,7 +326,7 @@ static PyObject *draw_func(PyObject * /*self*/, PyObject *args) if(!PyArg_ParseTuple(args, "OOOO", &pysession, &pygraph, &pyv3d, &pyrv3d)) return NULL; - + BlenderSession *session = (BlenderSession*)PyLong_AsVoidPtr(pysession); if(PyLong_AsVoidPtr(pyrv3d)) { @@ -594,7 +594,7 @@ static PyObject *osl_compile_func(PyObject * /*self*/, PyObject *args) if(!PyArg_ParseTuple(args, "ss", &inputfile, &outputfile)) return NULL; - + /* return */ if(!OSLShaderManager::osl_compile(inputfile, outputfile)) Py_RETURN_FALSE; |