diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-06-28 19:21:53 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-06-28 19:21:53 +0300 |
| commit | 732cd96737007b1411a161369f842209a4c26419 (patch) | |
| tree | 35e57564e2b60e6a6797f01ed8ac6b7c36b95e3a /release/scripts/startup/bl_operators/uvcalc_lightmap.py | |
| parent | 71278cc22a26bdd73d91d13888eeeb38ac64bbad (diff) | |
| parent | 5b325abf604954fc7172dfa3e436dca15897ab65 (diff) | |
Merge branch 'master' into asset-engine
Conflicts:
source/blender/blenloader/intern/writefile.c
Diffstat (limited to 'release/scripts/startup/bl_operators/uvcalc_lightmap.py')
0 files changed, 0 insertions, 0 deletions