Blender Git Loki

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.

Extended Mesh <-> BMesh copy function versions for specifying custom
data masks explicitly.

A dummy mesh is used for strand edit undo storage like in mesh edit
to prevent unnecessary code duplication. However, when copying from/to
BMesh only the mesh data layers are copied by default, omitting the new
data layers for strands (currently only MSurfaceSample hair root data).

Basic undo support in the new strand edit mode.

This uses the generalized undo stack system which is also used for
object data edit. An extension is necessary to tell the undo functions
which object is specifically used for generating undo data and
identifying the stack, since strand editing does not edit the obdata
itself.

Disabled the partial IK strand relaxation for the time being.

First goal is to reproduce current particle edit tools in the strand
edit mode, then make improvements.

Border Select operator for hair edit mode.

Select Linked operator for hair edit mode (select all vertices of a
strand).

Select/Deselect All operator for hair edit mode.

Lasso Select operator for hair edit mode.

Mouse Select operator for hair edit mode.