diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-06-07 11:06:46 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2016-06-07 11:06:46 +0300 |
| commit | ed6f86a5106e4c8de3fee0ba2ea495f7ac1455c0 (patch) | |
| tree | 4860e62638eb8075a8b64f97eb9f534895d70165 /source/blender/gpu/GPU_material.h | |
| parent | 24d29f2e500771257cc962e899630edaccb01cfe (diff) | |
| parent | 441a440cbbb700511d6d1ec01e2f149355adcc02 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/gpu/GPU_material.h')
0 files changed, 0 insertions, 0 deletions