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

..

BPH_mass_spring.cpp

Merge branch 'hair_immediate_fixes' into gooseberry

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

ConstrainedConjugateGradient.h

Moved the cloth solver code into a new subfolder/library inside Blender

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

eigen_utils.h

Main solver step for generating a divergence-free hair velocity field

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

hair_volume.cpp

Implemented PIC and FLIP methods for combining the fluid grid simulation

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

implicit_blender.c

Merge branch 'hair_immediate_fixes' into gooseberry

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

implicit_eigen.cpp

Perform grid-based velocity smoothing for hair outside of the implicit

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

implicit.h

Main solver step for generating a divergence-free hair velocity field

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