Blender Git Commits

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.

Added missing CD layer type name for MSurfaceSample.

Merge branch 'master' into strand_editmode

Conflicts:
source/blender/bmesh/bmesh_class.h
source/blender/bmesh/intern/bmesh_mesh_conv.h

Particle shapekey code is only in the gooseberry branch, disabled here.

SimDebugData is now global, for easier usage and less intrusive code.

Fix for CustomDataType syntax error from merging.

Cleanup: rename function argument for consistency.

Use the X mirror option in new strand edit stroke brush tools.

Note that currently this has virtually no effect, because the mirror
option relies on exact positions of vertices, which does not happen with
random hair placement (the add brush has no mirror option yet).

Eventually topological mirroring should help with this case, but is not
implemented for either old or new strand edit yet.

Utility methods for mirrored strand editing.

These are a modified version of their BMEditMesh counterparts.

use_topology is not yet implemented for strands. Native strand topology
is not very useful for this. Instead, the topology of the scalp mesh
should be used for finding mirrored strand roots, then the arc- or
parametric length of a vertex from the root to find mirrored verts.

Conflicts:
source/blender/blenkernel/BKE_editstrands.h

Minor code reshuffling.

Fix for strands undo creating an invalid BMesh.

When copying mesh data to bmesh the MVERT and similar customdata types
have to be omitted. Otherwise the bmesh instance ends up with NULL
pointers in customdata layers, but entries in the typemap != -1. The
effect was that when storing new steps after one or more undo, the
resulting original data would be copied, and subsequent undo steps
are ignored.

Sanity check: if there is no edited/active object for an undo step,
consider it invalid and clean up.

Removed deprecated UI button for the hair debug flag.