diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-12-21 17:36:22 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-12-21 17:56:15 +0300 |
| commit | adec52a8a843a5224e1e59a1dfdcff4986d7dc18 (patch) | |
| tree | f17eb41e91a0d8c2362e0dcff45c46e63cf7ac7f /intern/cycles/blender/blender_sync.h | |
| parent | 82c3fdd559b32d88881883b99cf441935401cf05 (diff) | |
| parent | d6ca47a344a8382daf1fd7cdcaeb5b3bea541c0e (diff) | |
Merge branch 'blender2.7' into master.
Diffstat (limited to 'intern/cycles/blender/blender_sync.h')
0 files changed, 0 insertions, 0 deletions