Blender Git Loki
Git Commits -> Revision 3c29aad
Revision 3c29aad by Bastien Montagne (master) September 4, 2016, 14:41 (GMT) |
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 |
Commit Details:
Full Hash: 3c29aad787f636167319950636f1497442075df8
Parent Commits: 4985838, e76e8fc