diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2016-08-28 16:27:30 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2016-08-28 16:27:30 +0300 |
| commit | f501e495fbe42421626b866a085a7546d6cd634b (patch) | |
| tree | 615f1e78ce67f294fec17192a91726e0f71ecc77 /intern/cycles/render/object.h | |
| parent | 286a4ad6f9f773d2862530227b61a8aacfb253b9 (diff) | |
| parent | a5261e06a309982a47e207faf59194c59408dbad (diff) | |
Merge branch 'master' into viewport_bvh_select
Diffstat (limited to 'intern/cycles/render/object.h')
0 files changed, 0 insertions, 0 deletions