Commit: 2681b66c1dfa2079f3a1ba1a2681c0a1561136ef
Author: Lukas Tönne
Date: Sat Apr 4 14:30:54 2015 +0200
Branches: gooseberry
https://developer.blender.org/rB2681b66c1dfa2079f3a1ba1a2681c0a1561136ef
Merge branch 'cycles_point_density' into gooseberry
Conflicts:
source/blender/blenkernel/intern/particle.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_particle_types.h
source/blender/makesdna/DNA_texture_types.h
source/blender/makesrna/intern/rna_particle.c
===================================================================
===================================================================
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
