Blender Git Loki

Intermediate commit.

Basically, we try to output coc values to a second render target, but
apparently OpenGL somehow hates us. Committing so that Mac may give a
better diagnostic on what is happening.

Simple hair strand integration function for the flow operator.

First stage of better dof, downsample buffer by half.

Stub handling of hair edit mode switch for the undo system.

Undo is not implemented for hair edit mode yet, but this prevents
operators from reloading blend files on redo, which otherwise exits
hair edit mode without cleaning up.

Merge branch 'master' into gooseberry

Add new shader files to Scons

Simple operator for solving and integrating the hair flow grid.

This would probably become an automatic update running in a job
eventually, but for testing this is the easiest implementation.

New strand functions in the physics library for solving hair flow grids.

WIP for new dof

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

Conflicts:
release/scripts/startup/bl_ui/space_sequencer.py
source/blender/blenkernel/BKE_sequencer.h
source/blender/blenkernel/intern/camera.c
source/blender/blenkernel/intern/sequencer.c
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/include/ED_view3d.h
source/blender/editors/render/render_opengl.c
source/blender/editors/render/render_preview.c
source/blender/editors/space_sequencer/sequencer_add.c
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/makesrna/intern/rna_color.c
source/blender/makesrna/intern/rna_image.c
source/blender/render/extern/include/RE_pipeline.h
source/blender/render/intern/source/external_engine.c
source/blender/render/intern/source/pipeline.c
source/blender/windowmanager/intern/wm_files.c

Blender 2.73 release commit

Hopefully this one would eb the exact revision used for 2.73 final release

New `mode` enum for hair edit mode to toggle between direct mesh-style
editing and flow solver editing.

The flow mode could be used to disable mesh vertex drawing and operators
and instead enable automatic recalculation of the hair flow field and
sampling strands.

Merge branch 'master' into gooseberry

Fix for compiler error with mingw64 about inlining functions with variadic args

Patch by Sergey

Merge branch 'master' into gooseberry

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

GTest was broken on Linux

BLI_string_utf8: add BLI_strncpy_utf8_rlen

Fix T43143: DPX header wrong, making it impossible to import to other software

The issue was caused by the single letter in header, which is expected to be
captial as per standard: http://www.simplesystems.org/users/bfriesen/dpx/S268M_Revised.pdf

Fix T43122: Shrinkwrap target, wrong linked object