[Bf-blender-cvs] [db87451] hair_system: Merge branch 'mesh_samples' into hair_system_solver

[Lukas Tönne]

Commit: db874518ffc861c82345bc40ad2b7d245a5cc1c7
Author: Lukas Tönne
Date:   Wed Sep 24 17:44:16 2014 +0200
Branches: hair_system
https://developer.blender.org/rBdb874518ffc861c82345bc40ad2b7d245a5cc1c7

Merge branch 'mesh_samples' into hair_system_solver

Conflicts:
	source/blender/blenkernel/BKE_mesh_sample.h
	source/blender/blenkernel/intern/implicit.c
	source/blender/blenkernel/intern/mesh_sample.c

===================================================================



===================================================================