From e97a186ffe0c3cca4a9d3edbf899f14a5de44edc Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 19 May 2014 19:17:40 +0200 Subject: Fix cycles standalone compile error of shading system enum change. --- intern/cycles/app/cycles_standalone.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'intern/cycles/app/cycles_standalone.cpp') diff --git a/intern/cycles/app/cycles_standalone.cpp b/intern/cycles/app/cycles_standalone.cpp index 7ea1ca2d8fb..90333eb3fc5 100644 --- a/intern/cycles/app/cycles_standalone.cpp +++ b/intern/cycles/app/cycles_standalone.cpp @@ -373,9 +373,9 @@ static void options_parse(int argc, const char **argv) } if(ssname == "osl") - options.scene_params.shadingsystem = SceneParams::OSL; + options.scene_params.shadingsystem = SHADINGSYSTEM_OSL; else if(ssname == "svm") - options.scene_params.shadingsystem = SceneParams::SVM; + options.scene_params.shadingsystem = SHADINGSYSTEM_SVM; #ifndef WITH_CYCLES_STANDALONE_GUI options.session_params.background = true; @@ -408,7 +408,7 @@ static void options_parse(int argc, const char **argv) fprintf(stderr, "Unknown shading system: %s\n", ssname.c_str()); exit(EXIT_FAILURE); } - else if(options.scene_params.shadingsystem == SceneParams::OSL && options.session_params.device.type != DEVICE_CPU) { + else if(options.scene_params.shadingsystem == SHADINGSYSTEM_OSL && options.session_params.device.type != DEVICE_CPU) { fprintf(stderr, "OSL shading system only works with CPU device\n"); exit(EXIT_FAILURE); } -- cgit v1.2.3