diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-05-02 17:05:23 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-05-02 17:05:23 +0300 |
| commit | 43e6bb85cee0802887eae9489a2bd73836daf41d (patch) | |
| tree | eaa106429af8341bf2123d7445fdab0af71b3dda /intern/cycles/kernel/osl/osl_shader.cpp | |
| parent | 7daeb1f9aee284d958abe87622b43c70c21af967 (diff) | |
| parent | ffaf91b5fc03f91e1fc90bd2f1d5dc5aa75656ff (diff) | |
Merge 'master' into 'collada'
Diffstat (limited to 'intern/cycles/kernel/osl/osl_shader.cpp')
0 files changed, 0 insertions, 0 deletions