diff options
Diffstat (limited to 'source/blender/yafray')
| -rw-r--r-- | source/blender/yafray/intern/export_File.cpp | 4 | ||||
| -rw-r--r-- | source/blender/yafray/intern/export_Plugin.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/yafray/intern/export_File.cpp b/source/blender/yafray/intern/export_File.cpp index db84ed01ab9..ac7d2703eb8 100644 --- a/source/blender/yafray/intern/export_File.cpp +++ b/source/blender/yafray/intern/export_File.cpp @@ -2017,7 +2017,7 @@ bool yafrayFileRender_t::executeYafray(const string &xmlpath) { ostr.str(""); if (re->r.mode & R_BORDER) { - ostr << command_path << "yafray -c " << re->r.YF_numprocs + ostr << command_path << "yafray -c " << re->r.threads << " -r " << (2.f*re->r.border.xmin - 1.f) << ":" << (2.f*re->r.border.xmax - 1.f) << ":" << (2.f*re->r.border.ymin - 1.f) @@ -2025,7 +2025,7 @@ bool yafrayFileRender_t::executeYafray(const string &xmlpath) << " \"" << xmlpath << "\""; } else - ostr << command_path << "yafray -c " << re->r.YF_numprocs << " \"" << xmlpath << "\""; + ostr << command_path << "yafray -c " << re->r.threads << " \"" << xmlpath << "\""; string command = ostr.str(); cout << "COMMAND: " << command << endl; diff --git a/source/blender/yafray/intern/export_Plugin.cpp b/source/blender/yafray/intern/export_Plugin.cpp index 560294e2ffa..abfdb5ed5dc 100644 --- a/source/blender/yafray/intern/export_Plugin.cpp +++ b/source/blender/yafray/intern/export_Plugin.cpp @@ -186,7 +186,7 @@ bool yafrayPluginRender_t::initExport() cerr << "Error loading yafray plugin: " << PIL_dynlib_get_error_as_string(handle) << endl; return false; } - yafrayGate = constructor(re->r.YF_numprocs, YafrayPluginPath()); + yafrayGate = constructor(re->r.threads, YafrayPluginPath()); cout << "YafRay plugin loaded" << endl; plugin_loaded = true; @@ -246,7 +246,7 @@ bool yafrayPluginRender_t::writeRender() params["bias"] = yafray::parameter_t(re->r.YF_raybias); params["clamp_rgb"] = yafray::parameter_t((re->r.YF_clamprgb==0) ? "on" : "off"); // lynx request - params["threads"] = yafray::parameter_t((int)re->r.YF_numprocs); + params["threads"] = yafray::parameter_t((int)re->r.threads); blenderYafrayOutput_t output(re); yafrayGate->render(params, output); cout << "render finished" << endl; |