[Bf-blender-cvs] [b38f645] master: Fix build error when building without OSL support.
Brecht Van Lommel
noreply at git.blender.org
Mon Dec 9 05:28:54 CET 2013
Commit: b38f645bf1b7b69cff98547abdeaf1b037012d39
Author: Brecht Van Lommel
Date: Mon Dec 9 05:28:01 2013 +0100
http://developer.blender.org/rBb38f645bf1b7b69cff98547abdeaf1b037012d39
Fix build error when building without OSL support.
===================================================================
M intern/cycles/render/osl.h
===================================================================
diff --git a/intern/cycles/render/osl.h b/intern/cycles/render/osl.h
index fe73f91..5824e2a 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;
More information about the Bf-blender-cvs
mailing list