Blender Git Loki

Merge branch 'master' into gooseberry

Conflicts:
source/blender/blenloader/intern/versioning_270.c

Small fix for smoke display thickness, setting was not initialized for
new smoke domains.

Thickness setting for smoke drawing in the OpenGL viewport.

This is the first actual drawing/display setting for smoke, so a new
panel "Display" has been added to give it a home in the UI.

The name "thickness" has been chosen deliberately to distinguish it from
density, since the parameter only affects OpenGL drawing but not the
actual physical density values.

Use matching defaults and ranges in RNA/BKE for hairsim parameters.

Unused line, the strand array offset is provided by the iterator now.

Better defaults for stretch stiffness and damping.

The strong stretch forces lead to awkward lengthening of segments when
the damping factor is too high.

In fact, in a natural hair strand the stretching usually means the hair
itself is curly and stretches as a helical spring. In that case
the damping is quite small compared to the stiffness, and little energy
is lost to the stretching (the hair becomes "bouncy"). When the hair is
very stiff the damping should also be small in order to avoid extreme
forces resulting from the hair root location constraint.

Merge branch 'master' into gooseberry

Conflicts:
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/object_dupli.c
source/blender/blenkernel/intern/sequencer.c
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/space_view3d/view3d_ops.c
source/blender/makesdna/DNA_sequence_types.h
source/blender/makesdna/DNA_view3d_types.h
source/blender/windowmanager/CMakeLists.txt
source/blender/windowmanager/intern/wm_operators.c
source/blenderplayer/bad_level_call_stubs/stubs.c

Fix for stretch forces being defined wrt. the root vertex.

Was not advancing the iterator for the previous vertex correctly.

Moved root animation calculation into the solver code.

The solver can calculate the de-facto velocity of the root using the
difference of the already-updated vertex location and the state from the
previous step.

Fix for simdebug data cache reading.

Data pointers were not advanced, so only the first debug element would
show up properly.

Take strand bounds into account when calculating bounding boxes for
dupli overrides.

Apply sim debug data from caches back to the global hash table.

Note that this is quite messy atm, it will override debug data if
different caches are used, and does not discriminate when writing to
caches either.

Write out sim debug data along with dupli caches, if the global sim
debug flag is enabled.

Merge branch 'cycles_point_density' into gooseberry

Fix for undefined psmd field in when evaluating particle textures.

SimDebugData writer/reader for Alembic caches.

This will allow debug visualization data to be stored inside caches
along the actual simulation state.

While the regular simulation allows examining simulation data on-the-fly
by stepping through the regular timeline, the new baking mechanism used
for caches does not easily allow simulation data to be visualized frame
by frame. Caching this data will allow adding it to the global sim debug
data.

This would also still be very handy if the baking process itself becomes
more interactive again. Unlike the current simulation progression, the
cached data can be accessed randomly, so scrubbing throught the timeline
becomes possible.

Fixed unused parameter warnings in Alembic customdata code.

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

Support for particle texture color in point density textures.

This works for all pointdensity use cases, BI as well as Cycles.

Particle color influence option for particle textures.

This color is currently only displayed in the viewport (when enabling
"Texture" color mode in the Display settings). It will be used for
controlling the smoke color when using particles for smoke emission.

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