Blender Git Loki

Merge branch 'master' into gooseberry

Merge branch 'master' into gooseberry

Conflicts:
source/blender/blenkernel/BKE_key.h
source/blender/blenkernel/intern/key.c

Merge branch 'master' into gooseberry

Merge branch 'master' into gooseberry

Merge branch 'master' into gooseberry

Merge branch 'wiggly-widgets' into gooseberry

Conflicts:
source/blender/makesrna/intern/rna_object.c
source/blenderplayer/bad_level_call_stubs/stubs.c

Cleanup the file mess with facemaps, make correct BKE/ED files for all
functions. Blenderplayer compiles again

Merge branch 'master' into gooseberry

Conflicts:
source/blender/blenkernel/intern/camera.c
source/blender/editors/space_sequencer/sequencer_draw.c

Merge branch 'master' into gooseberry

Gooseberry: Fix stubs for player, so buildbot can deliver builds again

Please note, that this commit doesn't fix issues with functions declared
in BKE header and implemented in editor/. This is to be fixed separately.

Properly register the `mathutils.interpolate` submodule.

Merge branch 'master' into gooseberry

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

Little experiment: hook up a transform operator to a bone facemap. For
now moves the mesh only, doesn't set the bone as selected.

Fix for invalid access to undefined hair data in edge-only cloth meshes.

Cloth data is used both for hair and actual cloth, which makes things
really difficult. The face number was used for distinguishing the two
types (no faces == hair mesh), but the extra hair data necessary for
hair sim is generated by particles and not available for edge-only cloth
meshes. This really needs to be sanitized ...

Facemap widgets:

* Only draw on mouse over
* Fix crash with highlighted widgets.

Modify facemaps mapping to bones.

Now simply add a flag to the armature modifier to use facemaps. Facemaps
on the mesh object with the same name as the armature bones will get
displayed as widgets.

Presets for hair dynamics.

This is necessary because the hair dynamics settings are not part of the
ParticleSettings datablock, but part of the convoluted cloth modifier
inside the particle system struct. In the future this will be recoded
properly, but in the meantime presets provide a simple an unobtrusive
way to have reusable dynamics settings for hair.

Merge branch 'master' into wiggly-widgets

Merge branch 'master' into gooseberry

Radical simplification of the wind effect on hair, since the previous
approach does not work very well.

Using a cross section estimate still causes large oscillations due to
varying hair force based on angles. It also requires a sensible hair
thickness value (particle radius) which is difficult to control and
visualize at this point.

The new model is based purely on per-vertex forces, which seems to be
much more stable. It's also somewhat justified by the fact that each
hair vertex represents a certain mass.