Blender Git Loki

Movie Writing: changes to encapsulate the elements (as oppose to have
everything static)

You can now export individual streams of videos (e.g., Movie_L.mov,
Movie_R.mov) safely! =)

Before that not only were the names clashing (as I initially thought)
but in fact the whole video streaming was mixed up (when you had to
export more than one video simultaneously).

The way to solve this is to *stop* using static elements and to create a
context to store the current movie data.

This commits involves a lot of changes, but I believe things are working
well. In fact the way I was handling MovieHandler was wrong (creating
arrays and all that), so I'm really glad I got to this.

Note: I couldn't test Frameserver, in fact test with the general codecs
(using multiview or not) are appreciated.

Thanks for Sergey Sharybin for the suggestions that lead to this
solution.

Merge remote-tracking branch 'origin/master' into multiview

Merge branch 'master' into gooseberry

Fix for slow deformation-motionblur in Cycles using the new spiral kink
mode.

This was caused by variation of the number of keys on child hairs due
to shortening of hair curves based on euclidian distances. The other
kink modes also shorten hairs, but use the parametric distance instead,
which does not vary with deformation of hairs.

Select appropriate folder for MinGW-w64 gcc 4.9

Move ptex packing stuff out of cycles

Merge branch 'master' into alembic_pointcache

Conflicts:
release/scripts/addons
source/blender/blenkernel/intern/pointcache.c
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/space_outliner/outliner_draw.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesrna/intern/rna_modifier.c
source/blender/modifiers/MOD_modifiertypes.h
source/blender/modifiers/intern/MOD_collision.c
source/blender/modifiers/intern/MOD_util.c

Merge branch 'master' into gooseberry

Add header guards

Add a top-level header for extern/ptex

Silence warning in Ptex

Update CMakeLists for ptex

Import ptex-2.0.42 into extern/ptex

Add flag to distinguish ptex files in texture node

Second variant of the copy-to-select operator for particles to only
copy the active particle system (and not remove existing in the process).

Make removal of existing particle systems on copying optional.

This will be most useful when copying individual particle systems
one-by-one (to be implemented).

Merge branch 'master' into gooseberry

Depsgraph: Code cleanup - Remove unneeded define

Depsgraph: Noted 2 places where driver evaluation should not be taking place

We can't remove these outright yet, since these callbacks are still shared between
old depsgraph and new ubereval nodes.

Depsgraph: Knock out BKE_animsys_evaluate_all_animation() for new depsgraph

To debug what animdata is not yet included, we need to disable this. Eventually,
it should go, but we may need to put it back temporarily if we don't get
everything hooked up before setting more users loose on the codebase.