diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2017-04-18 14:18:49 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2017-04-18 14:18:49 +0300 |
| commit | 792f0aaad54631712de02df6b301e58ae3b59575 (patch) | |
| tree | 92fa5d6638072faa60da1b6490091f57abf81b12 /intern/cycles/kernel/shaders/CMakeLists.txt | |
| parent | bc6f68944885da097d20e94812bbac58ade5f985 (diff) | |
| parent | 8825a8e951c193ff855a1bbfb5a34ea93b8ccc55 (diff) | |
Merge branch 'master' into HMD_viewportHMD_viewport
Conflicts:
source/blender/editors/gpencil/gpencil_paint.c
Diffstat (limited to 'intern/cycles/kernel/shaders/CMakeLists.txt')
| -rw-r--r-- | intern/cycles/kernel/shaders/CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/cycles/kernel/shaders/CMakeLists.txt b/intern/cycles/kernel/shaders/CMakeLists.txt index b43f8402d42..ef1f405e34e 100644 --- a/intern/cycles/kernel/shaders/CMakeLists.txt +++ b/intern/cycles/kernel/shaders/CMakeLists.txt @@ -81,6 +81,7 @@ set(SRC_OSL node_wireframe.osl node_hair_bsdf.osl node_uv_map.osl + node_principled_bsdf.osl node_rgb_to_bw.osl ) |