This repository has been archived on 2023-10-09. You can view files and clone it. You cannot open issues or pull requests or push a commit.

Bastien Montagne a35e733ff1 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/collada/MeshImporter.cpp
	source/blender/editors/object/object_add.c
	source/blender/editors/screen/screen_edit.c

2017-06-15 15:54:11 +02:00

42 KiB

Raw Blame History

View Raw