Bastien Montagne cbce7fef16 Merge branch 'master' into blender2.8
Conflicts:
	source/blender/blenkernel/intern/pointcache.c
	source/blender/makesrna/intern/rna_main_api.c
	source/blender/makesrna/intern/rna_particle.c
2016-06-27 15:59:01 +02:00
2013-12-24 22:57:27 +06:00
2016-01-04 14:20:48 +05:00
2016-05-21 05:48:10 +10:00
2016-02-10 00:26:12 +11:00
S
Description
No description provided
925 MiB
Languages
C++ 78%
Python 11%
C 6.3%
GLSL 2.2%
CMake 1.3%
Other 1.1%