Blender Git Commits

Merge branch 'cycles_point_density' into gooseberry

Color support for point density texture in Cycles.

This extends the point density evaluation to also store RGB color values
in the array provided by Cycles.

Since internally all Cycles textures are 4-float RGBA textures anyway,
it does not make a lot of sense to store density and color separately.
This could eventually be preferable to avoid unnecessary storage.

Merge branch 'alembic' into gooseberry

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

Added the major parameters for the hair simulation.

This is basically copied from existing cloth sim settings, with a good
deal of cleanup and sanitization.

Unlike cloth parameters, the damping values are described as relative
to their associated stiffness values for springs. This is much easier
to use in practice and less prone to lead to unstable simulations.
Damping simply works best when the force is in the same order of
magnitude as the stiffness, so having a relative factor requires much
less adjustment on the user side.

Added effector weights for cache hair simulation.

RNA for modifier struct subtypes.

Also renamed StrandSimParams to HairSimParams, since strands are only
the agnostic data structure, while these parameters are specifically
used to simulate hair-like behavior. Other simulations could use strands
but implement completely different kinds of physics (e.g. grass, ropes).

Smaller strips not working for files with sequencer

"Structural" spring forces for strands.

These connect strand points to ensure constant length and form the main
spring system in strand simulation.

Note that parameters are still hardcoded.

Fix unfreed motion state memory when freeing strand data.

Scalp animation support: copy strand root locations from the rest pose
before performing a time step.

Pinning for strand roots.

Note that roots are currently not animated.

Use FPS value to sync the strand simulation time with the render time.

Additionally the time can be scaled using the timescale parameter.

Correct progression handling of the strands motion state through cache
baking.

For now this simply applies gravity and applies the basic hair solver
for velocities and positions.

Make mattieu happy - allow smaller strips vertically.

Allows mattieu's masterplan to keep overdrop at higher sequencer space
and all strips lower.

This won't align text so well though, but will leave it simple and he
can give feedback later.

Cycles point density: Fix using double semicolon at the end of line

Fix for wrong pointer used in the modifier cache copy function.

Force calculation function for strands (only gravity atm).

Sanity check and nicer substep loop for strands simulation.

Fixed writing code for cache modifiers to include extra DNA fields of
subtypes.

Fixed DupliCache writers/readers to support subsequent stages of
cache manipulation.

Strand data in caches is now stored in a named list, so we can avoid
adding strand data in every frame.