Blender Git Loki

Merge branch 'master' into mesh_samples

Merge branch 'master' into strand_editmode

Fix unused function warning.

Fix meamleak from unfreed edit data when exiting in hair edit mode.

Fix unfreed temporary buffers in strand relaxation.

Define BMEditStrands struct as an extension of BMEditMesh.

The advantage is that we can now use this struct in the (rather involved)
process of generating a display DerivedMesh and apply modifiers to it.

Disable regular mesh drawing in hair edit mode.

Proof-of-concept: Hair edit data from regular meshes.

This adds the possibility to edit a regular mesh like strand data.
It's more of a test for independence from particles than a real use case,
but could come in handy anyway.

Check mesh samples for zero weights on eval to detect invalid/unusable samples.

Corrected implementation of the strand relaxation method ported from particles.

This is still the same algorithm as in particle edit mode, but cleaned up
some unnecessary complications and use much more meaningful variable names.

Merge branch 'master' into strand_editmode

Merge branch 'master' into mesh_samples

Port over the improved mesh sampling API from the mesh_samples branch.

Merge branch 'master' into mesh_samples

Merge branch 'master' into strand_editmode

Conflicts:
source/blender/editors/sculpt_paint/paint_ops.c

Implementation of Volume Sampling on meshes.

Based on the ray casting technique described here: http://www.joesfer.com/?p=84

Volume samples currently are not bound to mesh deformation in any way, they are
simple object-space locations. Potentially a harmonic weight approach as in
mesh cages could be used.

Merge branch 'master' into mesh_samples

Conflicts:
release/datafiles/locale
release/scripts/addons
source/blender/blenkernel/CMakeLists.txt

Another fix for mirror editing of strand data.

Currently strand edit mode tool use the object data 'x mirror' flag.
This flag is only available on mesh objects, but the strand editing
can be used for dupli override caches etc. as well. Eventually strand
editing should get it's own independent flag to avoid this problem.

Fix for call to mirror functions when mirroring is not enabled, giving
warnings.

Moved particle related functions of the strands edit mode into a
separate file.

This may seem a bit like overkill, but it helps ensure that no particle
depedencies messes up the strand editing code. The same will be done for
other use cases of the strand editing code in the future.