Bastien Montagne 24d29f2e50 Merge branch 'master' into blender2.8
Conflicts:
	source/blender/blenkernel/intern/particle.c
	source/blender/editors/transform/transform_snap_object.c
2016-06-07 09:59:26 +02:00
2016-06-07 14:02:32 +10:00
2013-12-24 22:57:27 +06:00
2016-01-04 14:20:48 +05:00
2010-10-13 14:44:22 +00:00
2016-05-21 05:48:10 +10:00
2016-02-10 00:26:12 +11: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%