diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-04-04 16:03:55 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-04-04 16:03:55 +0300 |
| commit | 160e62b88cdcc927b7cb3741c7ea0565412e8016 (patch) | |
| tree | 3561447e02e088a056f85f10d13094a7fb49b9ca /intern/gawain | |
| parent | 59562e5b259ccc1e02e4f943394ca9db5ac938c7 (diff) | |
| parent | d59c2d12b1226afa3789b0ef142f8f6cc9356ead (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/BKE_object.h
Diffstat (limited to 'intern/gawain')
0 files changed, 0 insertions, 0 deletions