Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2014-05-19 21:17:40 +0400
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2014-05-19 21:33:09 +0400
commite97a186ffe0c3cca4a9d3edbf899f14a5de44edc (patch)
tree3ed28ad2b5cb4e0c134d39652f8bc01d2b2b821b /intern/cycles/app/cycles_standalone.cpp
parent3b53fffb7788e19a0d05b8549aadbadf49279ca2 (diff)
Fix cycles standalone compile error of shading system enum change.
Diffstat (limited to 'intern/cycles/app/cycles_standalone.cpp')
-rw-r--r--intern/cycles/app/cycles_standalone.cpp6
1 files changed, 3 insertions, 3 deletions
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);
}