Blender Git Loki

Git Commits -> Revision 4789093

July 15, 2015, 19:45 (GMT)
Merge branch 'master' into cycles_point_density

Conflicts:
intern/cycles/kernel/svm/svm.h
source/blender/blenkernel/intern/particle_system.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesrna/intern/rna_nodetree.c
source/blenderplayer/bad_level_call_stubs/stubs.c

Commit Details:

Full Hash: 478909361fecffef836154663251b2a4b39976e4
Parent Commits: 334430e, 548e650

Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18 MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2022