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>2019-05-02 16:39:23 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-05-03 16:36:20 +0300
commit08a44d29815f6b0b9b675a503829d2e2ce7f6426 (patch)
tree42c195e502875ef46a277fecef17e450e06e3d8b /intern/cycles/render/osl.h
parent45ad6cd5a785733612e0b355df7426154f262308 (diff)
Cleanup: refactor passing of OSL kernel globals for upcoming changes
Diffstat (limited to 'intern/cycles/render/osl.h')
-rw-r--r--intern/cycles/render/osl.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/intern/cycles/render/osl.h b/intern/cycles/render/osl.h
index aec518a6c2b..4d930d65e45 100644
--- a/intern/cycles/render/osl.h
+++ b/intern/cycles/render/osl.h
@@ -129,9 +129,10 @@ class OSLCompiler {
public:
OSLCompiler(void *manager,
void *shadingsys,
+ OSLGlobals *osl_globals,
ImageManager *image_manager,
LightManager *light_manager);
- void compile(Scene *scene, OSLGlobals *og, Shader *shader);
+ void compile(Scene *scene, Shader *shader);
void add(ShaderNode *node, const char *name, bool isfilepath = false);
@@ -175,6 +176,7 @@ class OSLCompiler {
void *shadingsys;
void *manager;
+ OSLGlobals *osl_globals;
ShaderType current_type;
Shader *current_shader;
};