io_scene_obj/import_obj.py · 234cf14fe72afd2ab3433935465a01307d2465f0 · blender / blender-addons · GitLab

Snippets Groups Projects

6 years ago
1aa75b05
Merge branch 'master' into blender2.8 · 1aa75b05
Bastien Montagne authored 6 years ago
```
Conflicts:
	io_scene_obj/__init__.py
	io_scene_obj/import_obj.py
```
1aa75b05

History
Merge branch 'master' into blender2.8
Bastien Montagne authored 6 years ago
```
Conflicts:
	io_scene_obj/__init__.py
	io_scene_obj/import_obj.py
```