diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-10-03 10:22:07 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-10-03 10:22:07 +0400 |
commit | b39b6c7fdaf1827334b9945a3c3383dbf9e78d36 (patch) | |
tree | 1635b08f45bb8be294b742f4f1e788527ddaf021 /intern/cycles/render/scene.cpp | |
parent | cda535dced20f7f4ed7caa2f96f603058917064f (diff) | |
parent | 50af4d208d7d2f3cbc789e91e54d87adf37590fb (diff) |
Merge branch 'master' into dyntopo_holes
Diffstat (limited to 'intern/cycles/render/scene.cpp')
0 files changed, 0 insertions, 0 deletions