Blender Git Loki

New voxel texture mode "Hair", for displaying the internal hair volume
structure as a texture.

This is mostly a debugging feature that may be removed again later.

Merge branch 'master' into temp_custom_loop_normals

Conflicts:
source/blender/blenkernel/BKE_cdderivedmesh.h
source/blender/blenkernel/BKE_mesh.h
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/editderivedmesh.c
source/blender/blenkernel/intern/mesh_evaluate.c
source/blender/blenkernel/intern/mesh_remap.c
source/blender/bmesh/intern/bmesh_mesh.c
source/blender/bmesh/intern/bmesh_mesh.h
source/blender/makesrna/intern/rna_mesh_api.c

Note: commented out part of 'copynors' modifier code, we will get rid of this one soon anyway.

Code cleanup: Use a variable-sized array for the hair volume velocity
smoothing and collision code, split into multiple functions.

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.

Merge branch 'master' into gooseberry

Merge branch 'master' into asset-experiments

Revert "Squashed commit of asset-experiments branch."

This reverts commit c9b2470b5ca21b11c14bca285a21243b3d809456.

Squashed commit of asset-experiments branch.

Merge branch 'master' into experimental-build

Merge branch 'master' into asset-experiments

Fix for Windows - 'foobar.blend' is a valid file path to that OS, sigh...

Also, store temp nullified pathsep in chars now, better.

Fix stupid UI/py bug after recent refactor.

Merge branch 'master' into asset-experiments

Revert "See if multiview is building fine"

This reverts commit f46c8377eb374014376d0da43d5e0a7fbcc5b700.

See if multiview is building fine

Fix some building issues (hopefully)

Revert "Multiview, squash test"

This reverts commit ef4e842abba80d5cce66ff3178c014d8c5fcf97f.

Multiview, squash test

(I want to see if everything builds fine after my
last changes to the video exporting system)

Merge remote-tracking branch 'origin/master' into experimental-build