diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-11-08 17:13:43 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-11-08 17:15:29 +0300 |
| commit | 146b39a45d4ad1b36a977d19984797f984f161ec (patch) | |
| tree | c44be89db5b92c2ca5328933b3a1e6f891f77dbd /intern/cycles/render/shader.h | |
| parent | 3cf724209f619071555c1acce5958a13a11103e5 (diff) | |
| parent | 116be3deffc087a61cdab452cd17bcaaf049a508 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/render/shader.h')
| -rw-r--r-- | intern/cycles/render/shader.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/cycles/render/shader.h b/intern/cycles/render/shader.h index e898d984f5a..890208c4bf8 100644 --- a/intern/cycles/render/shader.h +++ b/intern/cycles/render/shader.h @@ -198,6 +198,8 @@ public: float linear_rgb_to_gray(float3 c); + string get_cryptomatte_materials(Scene *scene); + protected: ShaderManager(); |