Skip to content
Snippets Groups Projects
Commit 1aa75b05 authored by Bastien Montagne's avatar Bastien Montagne
Browse files

Merge branch 'master' into blender2.8 

Conflicts:
	io_scene_obj/__init__.py
	io_scene_obj/import_obj.py
parents e4063432 6d62e07f
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment