Lukas Tönne 046510fcf9 Merge branch 'hair_immediate_fixes' into gooseberry ...

Conflicts:
	source/blender/physics/intern/BPH_mass_spring.cpp

2015-01-20 09:30:07 +01:00

..

intern

Merge branch 'hair_immediate_fixes' into gooseberry

2015-01-20 09:30:07 +01:00

BPH_mass_spring.h

Reimplemented the voxel texture type for displaying hair continuum grids.

2015-01-20 09:30:05 +01:00

CMakeLists.txt

Added new header for Eigen utility classes.

2015-01-20 09:30:06 +01:00

SConscript

More scons fixes for physics lib.

2015-01-20 09:30:02 +01:00