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 43eebdfebd Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/collada/DocumentImporter.cpp
	source/blender/editors/include/ED_object.h
	source/blender/editors/object/object_modifier.c

2018-06-12 12:58:31 +02:00

14 KiB

Raw Blame History

View Raw