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
path: root/intern
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2013-12-09 08:28:01 +0400
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2013-12-09 08:28:19 +0400
commitb38f645bf1b7b69cff98547abdeaf1b037012d39 (patch)
tree542517aca6ec2b6d2363df105ade1966b58d6ba9 /intern
parentc6620905a7c812aefac128f95960a38123b5af38 (diff)
Fix build error when building without OSL support.
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/render/osl.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/cycles/render/osl.h b/intern/cycles/render/osl.h
index fe73f912483..5824e2ace64 100644
--- a/intern/cycles/render/osl.h
+++ b/intern/cycles/render/osl.h
@@ -142,6 +142,7 @@ public:
ImageManager *image_manager;
private:
+#ifdef WITH_OSL
string id(ShaderNode *node);
OSL::ShadingAttribStateRef compile_type(Shader *shader, ShaderGraph *graph, ShaderType type);
bool node_skip_input(ShaderNode *node, ShaderInput *input);
@@ -150,6 +151,7 @@ private:
void find_dependencies(set<ShaderNode*>& dependencies, ShaderInput *input);
void generate_nodes(const set<ShaderNode*>& nodes);
+#endif
void *shadingsys;
void *manager;