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 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

59 KiB

Raw Blame History

View Raw