Blender Git Loki

Missing bmesh include folder for hair editor in scons.

New drawing code for hair edit mode.

Conflicts:
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_intern.h

Removed deprecated code.

Free strand edit memory after use.

Store the hair key weight in edit mode.

Currently particles only have a single weight value, controlling
pinning in the simulation (for root and virtual root verts) and goal
force scaling. This will be replaced by a full vertex group weight
system eventually.

CustomData layer for storing hair root locations as MSurfaceSamples.

This requires converting the old messy particle num/num_dmcache/fuv/foffset
data into the new mesh samples, which can potentially introduce floating
point errors and inaccuracies due to lack of face index mapping in the
new system. However, in any well-constructed particle system the hair
roots should be nearest to their num face, so mapping would be accurate
enough. If necessary face index data could be added to samples as a
legacy code hack, but probably it's best to eventually replace the
hair system as a whole anyway.

Fix for verts-of-strand iterator: This requires a second pointer in
addition to the edge, otherwise the last point is omitted.

First customdata layer for particle mass.

This is more for testing purposes, since currently there is only a
single mass property for the psys as a whole. This should change in the
future though, to allow variable mass per strand or vertex.

Conflicts:
source/blender/bmesh/intern/bmesh_interp.c

Fix for verts-of-strand iterator: After last edge step has to set the
edge to NULL to avoid infinite looping over the same edge (1-elem disk).

Fix for particle-to-bmesh: only was looping over totvert instead of
pa->totkey.

Basic particle data reconstruction when exiting edit mode.

Intermediate commit: switching strand edit data to BMesh.

Hair/Strand editing will only use a subset of the bmesh topology and
expect a specific topology that needs to be verified and enforced.
However, this extra requirement is much less work than reimplementing a
whole edit data system with the same feature set as bmesh and avoids
much redundant code.

Conflicts:
source/blender/blenkernel/intern/customdata.c
source/blender/makesdna/DNA_customdata_types.h

New customdata type for mesh surface samples.

Conflicts:
source/blender/makesdna/DNA_customdata_types.h

Switched the hair edit data to a bmesh-like structure for consistency.

This means using mempools to store curve and vertex data, which allows
arbitrary addition and removal of data more easily. Also this includes
an iterator system similar to bmesh iterators (although the simpler
topology makes it a lot less complex).

Conflicts:
source/blender/blenkernel/intern/customdata.c
source/blender/makesdna/DNA_customdata_types.h

Reconstruct most basic particle data when applying the hair edit, so
particle hairs remain visible.

Note that currently the hair root location (num/num_dmcache, fuv, foffset)
is not stored from edit data, so all hairs end up in a default location.

Store hair edit data in particle systems and manage it in the operator
for entering/exiting the edit mode.

Conflicts:
source/blender/blenkernel/intern/particle.c

Moved code for the hair edit data structures to blenkernel.

This makes it work more like editmesh, and avoid the awkward and
basically bad-level approach in particles, where the edit data is an
anonymous pointer in particle systems together with a callback for
freeing.

Conflicts:
source/blender/blenkernel/CMakeLists.txt

New edit mode for hair.

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

New editor library for hair edit mode.

Minor syntax fix.