sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cleanup: Simplify Cycles standalone OSL detection code.

Browse Source
This commit is contained in:
Thomas Dinges 2014-01-25 13:25:26 +01:00
parent 3b32507b41
commit 1dd05a1e7b
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
intern/cycles/app/cycles_standalone.cpp
View File

@ -231,11 +231,6 @@ static void options_parse(int argc, const char **argv)
/* shading system */ /* shading system */
string ssname = "svm"; string ssname = "svm";
string shadingsystems = "Shading system to use: svm";
#ifdef WITH_OSL
shadingsystems += ", osl";
#endif
/* parse options */ /* parse options */
ArgParse ap; ArgParse ap;
@ -244,7 +239,9 @@ static void options_parse(int argc, const char **argv)
ap.options ("Usage: cycles [options] file.xml", ap.options ("Usage: cycles [options] file.xml",
"%*", files_parse, "", "%*", files_parse, "",
"--device %s", &devicename, ("Devices to use: " + device_names).c_str(), "--device %s", &devicename, ("Devices to use: " + device_names).c_str(),
#ifdef WITH_OSL
"--shadingsys %s", &ssname, "Shading system to use: svm, osl", "--shadingsys %s", &ssname, "Shading system to use: svm, osl",
#endif
"--background", &options.session_params.background, "Render in background, without user interface", "--background", &options.session_params.background, "Render in background, without user interface",
"--quiet", &options.quiet, "In background mode, don't print progress messages", "--quiet", &options.quiet, "In background mode, don't print progress messages",
"--samples %d", &options.session_params.samples, "Number of samples to render", "--samples %d", &options.session_params.samples, "Number of samples to render",
@ -313,12 +310,10 @@ static void options_parse(int argc, const char **argv)
} }
#ifdef WITH_OSL #ifdef WITH_OSL
else if(!(ssname == "osl" || ssname == "svm")) { else if(!(ssname == "osl" || ssname == "svm")) {
#else
else if(!(ssname == "svm")) {
#endif
fprintf(stderr, "Unknown shading system: %s\n", ssname.c_str()); fprintf(stderr, "Unknown shading system: %s\n", ssname.c_str());
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
#endif
else if(options.scene_params.shadingsystem == SceneParams::OSL && options.session_params.device.type != DEVICE_CPU) { else if(options.scene_params.shadingsystem == SceneParams::OSL && options.session_params.device.type != DEVICE_CPU) {
fprintf(stderr, "OSL shading system only works with CPU device\n"); fprintf(stderr, "OSL shading system only works with CPU device\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);