diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-04-05 11:02:25 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-04-05 11:02:25 +0300 |
| commit | e9bb018a4aea1b4aeb692cdadce158496a270e32 (patch) | |
| tree | 9f8c122feb8a68cc34f5ab6c99407a20d72fa50d /source/blender/editors/uvedit | |
| parent | 4dadb6d4453d84d537e25e753f7904ce5c8539fb (diff) | |
| parent | 8647d5af9015097698984e9864802848914e803c (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/alembic/intern/abc_exporter.h
Diffstat (limited to 'source/blender/editors/uvedit')
0 files changed, 0 insertions, 0 deletions