diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-09-29 12:55:00 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-09-29 12:55:00 +0300 |
commit | e3fe8128e41bb7c576f02ba234dfabf5c399cb60 (patch) | |
tree | cd148a38fb32cdb1a36fc576b9f36fe864003e40 /source/gameengine/Ketsji/KX_BlenderMaterial.h | |
parent | 31be6fccf83095f4245f97730ccc7e61e51cfcec (diff) | |
parent | 5a1954a5cbd7b0b1458fdc80ada5acd036278309 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/gameengine/Ketsji/KX_BlenderMaterial.h')
0 files changed, 0 insertions, 0 deletions