diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-10-28 18:41:30 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-10-28 18:41:30 +0300 |
| commit | 046735d75148f5e27a3f4917010dd80f1691705d (patch) | |
| tree | db5a18ba5aa7e2178f4f1e34e7959c025b5677dc /intern/cycles/render/shader.cpp | |
| parent | 94ab6429bbdaf9f3541c715c5ae32647d454692a (diff) | |
| parent | e3d2df038001af8c67707c20a27e21571b1fdff6 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/render/shader.cpp')
| -rw-r--r-- | intern/cycles/render/shader.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/intern/cycles/render/shader.cpp b/intern/cycles/render/shader.cpp index e428e174712..13075a1ee2c 100644 --- a/intern/cycles/render/shader.cpp +++ b/intern/cycles/render/shader.cpp @@ -30,6 +30,7 @@ #include "render/tables.h" #include "util/util_foreach.h" +#include "util/util_murmurhash.h" #ifdef WITH_OCIO # include <OpenColorIO/OpenColorIO.h> @@ -524,12 +525,15 @@ void ShaderManager::device_update_common(Device *device, if(shader->is_constant_emission(&constant_emission)) flag |= SD_HAS_CONSTANT_EMISSION; + uint32_t cryptomatte_id = util_murmur_hash3(shader->name.c_str(), shader->name.length(), 0); + /* regular shader */ kshader->flags = flag; kshader->pass_id = shader->pass_id; kshader->constant_emission[0] = constant_emission.x; kshader->constant_emission[1] = constant_emission.y; kshader->constant_emission[2] = constant_emission.z; + kshader->cryptomatte_id = util_hash_to_float(cryptomatte_id); kshader++; has_transparent_shadow |= (flag & SD_HAS_TRANSPARENT_SHADOW) != 0; |