diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-05-02 16:29:00 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-05-02 16:29:00 +0300 |
commit | 7f833c0da8848d424de9d2324412d8ca9d9c4e30 (patch) | |
tree | 223a60022188132e5f7b64e9c649f80d72bfbcd7 /intern/cycles/blender/blender_sync.h | |
parent | ec9ce9e11864146dc6748f2388b56f95346a5053 (diff) | |
parent | 4384a7cf463eedea83179da80bbe12ff7d55578a (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/blender/blender_sync.h')
0 files changed, 0 insertions, 0 deletions