Bastien Montagne 5a82aee9e6 Merge branch 'master' into blender2.8
Conflicts:
	source/blender/alembic/intern/abc_exporter.cc
	source/blender/blenkernel/BKE_mball.h
	source/blender/blenkernel/intern/depsgraph.c
	source/blender/blenkernel/intern/mball.c
	source/blender/editors/object/object_add.c
	source/blender/render/intern/source/convertblender.c
2018-05-31 16:57:39 +02:00
2018-05-18 13:34:24 +02:00
2018-05-31 16:05:47 +02:00
2018-04-24 12:26:37 +02:00
2010-10-13 14:44:22 +00:00
2018-05-27 11:06:29 +02:00
Description
No description provided
841 MiB
Languages
C++ 78%
Python 14.9%
C 2.9%
GLSL 1.9%
CMake 1.2%
Other 0.9%