diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2020-03-11 18:51:42 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2020-03-11 19:05:15 +0300 |
| commit | 9910803574c4472e348ce140a49fc4fb212f9ee7 (patch) | |
| tree | 4876c3b81f1bcd83e08f9b7eed4936950b1e4cfc /intern/cycles/render/osl.h | |
| parent | 9ef7759bf030344d4d44c0ac75c706ce40b98d04 (diff) | |
Fix Cycles link error with debug + asan after RTTI changes
Diffstat (limited to 'intern/cycles/render/osl.h')
| -rw-r--r-- | intern/cycles/render/osl.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/intern/cycles/render/osl.h b/intern/cycles/render/osl.h index 62cbfebf7eb..4dd9f6630f2 100644 --- a/intern/cycles/render/osl.h +++ b/intern/cycles/render/osl.h @@ -93,9 +93,10 @@ class OSLShaderManager : public ShaderManager { OSLShaderInfo *shader_loaded_info(const string &hash); /* create OSL node using OSLQuery */ - OSLNode *osl_node(const std::string &filepath, - const std::string &bytecode_hash = "", - const std::string &bytecode = ""); + static OSLNode *osl_node(ShaderManager *manager, + const std::string &filepath, + const std::string &bytecode_hash = "", + const std::string &bytecode = ""); protected: void texture_system_init(); |