diff options
| author | Hans Goudey <h.goudey@me.com> | 2020-08-12 21:19:05 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2020-08-12 21:19:05 +0300 |
| commit | 31705201dddebf7e3be5c4533b89f380aad1ede1 (patch) | |
| tree | 53c8be86b15e9ebd96dd60cad52e6acac8ce2324 /intern/cycles/device/device.h | |
| parent | ea4c327c977223922c41c889fa2bd51403409dca (diff) | |
| parent | 337b6d075880ea44ff5183804a387dc98673ffb9 (diff) | |
Merge branch 'master' into active-fcurve-keyframe
Diffstat (limited to 'intern/cycles/device/device.h')
0 files changed, 0 insertions, 0 deletions