diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-06-07 13:01:09 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-06-07 13:01:09 +0300 |
| commit | 366ac88d685d569e5eaa19ce3fc43764683b60fd (patch) | |
| tree | 105fe398a57a1a1f642b0642df87fcf5eb70d4ca /source/blender/gpu/GPU_material.h | |
| parent | a54235e0c6345faed6b7f709039ff6efa64d2549 (diff) | |
| parent | 16017178b24c9c84df5c1114fae8dce4796c6c26 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/gpu/GPU_material.h')
0 files changed, 0 insertions, 0 deletions