Blender Git Loki

Disabled fallback path drawing for now, is currently nested inside the
OpenGL immediate mode calls.

Ignore paths with segments == -1, this is used to indicated hidden
children.

Use line drawing as a fallback if only one child is assigned to a parent.

Fix for recent particle drawing commit, need to update the local draw
data variable after changing the buffer.

Don't draw 2-sided flat hulls, this just gives ugly Z fighting.

Sorting of child particles by primary parent and offset in hair space.

This is a prerequisite for constructing the convex hull of child paths
around a parent.

Simple immediate-mode OpenGL drawing for convex child hair hulls.

More code cleanup to avoid crazy huge and messy particle functions.

Calculate normals and use smooth shading in the strand direction for
child hulls.

Note that the perpendicular direction around the hair bundles is not
smooth-shaded. Smooth shading doesn't make as much sense there because
large angles are common in this direction and give awkward shading
results.

Cleanup: Make path update flag tests a little bit more understandable.

New draw mode 'HULL' for hair drawing.

Not implemented yet, currently uses just the child path drawing.

quiet py exception

Merge branch 'master' into gooseberry

Merge branch 'master' into gooseberry

Removed the solver_index from cloth vertices.

This was used as part of the "sim preview" feature, where some amount of
vertices were tagged as disabled in the particle system. Due to the
mind twisting complexity of using the nested cloth modifier to simulate
hair strands indirectly it became necessary to still store all the
vertices, but then disable them again on the solver level ... If this
ever gets reimplemented it must be done in a sane way, avoiding the
cloth step altogether.

Merge branch 'master' into gooseberry

Conflicts:
source/blender/editors/space_view3d/view3d_draw.c
source/blender/physics/intern/BPH_mass_spring.cpp
source/blender/physics/intern/implicit_blender.c

Merge branch 'master' into gooseberry

Conflicts:
release/scripts/startup/bl_ui/properties_particle.py
source/blender/physics/intern/BPH_mass_spring.cpp

Merge branch 'master' into gooseberry

Conflicts:
release/scripts/startup/bl_ui/properties_particle.py
source/blender/blenkernel/BKE_cloth.h
source/blender/blenkernel/intern/cloth.c
source/blender/blenkernel/intern/collision.c
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/physics/particle_edit.c
source/blender/makesdna/DNA_particle_types.h
source/blender/physics/BPH_mass_spring.h
source/blender/physics/intern/BPH_mass_spring.cpp
source/blender/physics/intern/implicit_blender.c

Fix for incorrect DNA field name in versioning, causes constant
resetting of clump noise size on reload.

Use separate flags to enable/disable clump and roughness curves for
child hairs.

This allows disabling the curves temporarily without losing the setup.