diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-12-11 17:56:04 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-12-11 17:56:04 +0300 |
| commit | 4d115f21595d255f2d335d2f307ee822b381ea54 (patch) | |
| tree | dbbd84b1539f4b87df608cb3e7c84cfde5fcb3f6 /intern/cycles/blender/blender_python.cpp | |
| parent | 54e1d3815762ef964a74f179ef846110673e743f (diff) | |
| parent | 66d8bfb85c61aafe3bad2edf0e7b4d9d694ee2e7 (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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_python.cpp b/intern/cycles/blender/blender_python.cpp index ba9d6181e1c..768c1c589b6 100644 --- a/intern/cycles/blender/blender_python.cpp +++ b/intern/cycles/blender/blender_python.cpp @@ -504,7 +504,7 @@ static PyObject *osl_update_node_func(PyObject * /*self*/, PyObject *args) socket_type = "NodeSocketString"; data_type = BL::NodeSocket::type_STRING; if(param->validdefault) - default_string = param->sdefault[0]; + default_string = param->sdefault[0].string(); } else continue; |