diff options
| author | Hans Goudey <h.goudey@me.com> | 2021-02-27 02:10:51 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2021-02-27 02:10:51 +0300 |
| commit | f0c9c7c2000406ca695eb431fa740c5a1ab21a47 (patch) | |
| tree | 177cf2438c1b413fa896f4b5f68a202593541008 /intern/cycles/render/shader.cpp | |
| parent | 109da73b9887f565f2f440975b8861bd553eff21 (diff) | |
Fix conflicts and build error from merge
Diffstat (limited to 'intern/cycles/render/shader.cpp')
0 files changed, 0 insertions, 0 deletions