Bastien Montagne 3c29aad787 Merge branch 'master' into blender2.8 ...

Conflicts:
	intern/cycles/blender/blender_particles.cpp
	source/blender/blenkernel/intern/particle.c
	source/blender/gpu/intern/gpu_shader.c

2016-09-04 16:41:06 +02:00

..

extern

Removed most particle system code from RNA.

2016-04-12 18:26:19 +02:00

intern

Cleanup: Reduce amount of misleading indentation

2016-09-01 12:14:16 +02:00

CMakeLists.txt

…

COPYING

…

COPYING_trimesh2

…