Synchronize libmv with changes in git branch

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@46489 954f8c5b-7b00-dc11-b283-0030488c597c
Bundle updated version of carve. Should be no functional changes, small code cleanup

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@46490 954f8c5b-7b00-dc11-b283-0030488c597c
Carve and libmv bundling scripts: should work with svn checkout now

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@46492 954f8c5b-7b00-dc11-b283-0030488c597c
Style cleanup: use 2 spaces for indentation in bundle scripts

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@46494 954f8c5b-7b00-dc11-b283-0030488c597c
Enable ffmpeg building with MinGW-w64. The libraries were compiled with gcc 4.7, however is has been claimed there are issues with gcc > 4.4 so this is for testing purposes. Still it doesn't crash on startup anymore. Forgot to mention on ffmpeg lib commit that committed ffmpeg version is 0.10.2

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@46496 954f8c5b-7b00-dc11-b283-0030488c597c
patch [#30871] VSE py-api 
from Dan Eicher (dna)

--- message from the tracker

Classes for all effect types with proper input attributes

Added new/delete functions for SequenceEditor.sequences.

push/pop functions for ImageSequence.elements to add/remove images

Moved waveform from the base class to SoundSequence (probably should be renamed use_waveform or show_waveform)

Fixed user count for scene and movie clip types

--- my own comments

- dont have blending mode argument from sequencer.new_*() functions. Better edit this after.

- dont change waveform attribute, seems unrelated change and should be kept for sound afaik.

- dont apply scene, clip usercount changes - Sergey dealt with these separately.



git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@46501 954f8c5b-7b00-dc11-b283-0030488c597c
style cleanup: sequencer and scene rna

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@46502 954f8c5b-7b00-dc11-b283-0030488c597c
Fix #31393: Shape Keys on curves with hooks

Own mistake when was fixing #30561 - handles ARE included in shape keys

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@46503 954f8c5b-7b00-dc11-b283-0030488c597c
minor changes to sequencer api
- rename seqelements.push(file) --> filename
- rename SoundSequence.waveform --> show_waveform
- dont pass context to sequencer functions. editing any scenes sequence can be done, irrespective of context.


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@46504 954f8c5b-7b00-dc11-b283-0030488c597c
Fix #31221: Multiple Monitors/Windows Double Click For Focus

Window might be focused by mouse click in configuration of window manager
when focus is not following mouse.
Click could have been done on a button and depending on window manager settings
click would be passed to blender or not, but in any case button under cursor
should be activated. Currently the easiest way to activate button is to
generate mouse move event.

Not sure about OSX, but on windows it worked fine because OS is generating
WM_MOUSEMOVE event "automatically" so nothing special from blender side was
needed.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@46505 954f8c5b-7b00-dc11-b283-0030488c597c
Fix #31379: cycles not recognizing 16 bit tiff as float image.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@46506 954f8c5b-7b00-dc11-b283-0030488c597c
Code cleanup for parameters of subsurf_make_derived_from_derived.

This is the first commit of the sculpt masking merge. Documentation:
http://wiki.blender.org/index.php/User:Nicholasbishop/PaintMasks

Thanks to Brecht for reviewing!

Replaced four boolean parameters with a single flag and a new enum,
SubsurfFlags.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@46509 954f8c5b-7b00-dc11-b283-0030488c597c
Code cleanup for multires_dm_create_from_derived().

Changed name to multires_make_derived_from_derived() and parameter
order to be more similar to subsurf_make_derived_from_derived().

Added MultiresFlags enum with flag values to replace the local_mmd and
useRenderParams parameters.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@46510 954f8c5b-7b00-dc11-b283-0030488c597c
Add an RNA access function to get an enum item name from its value.

New function is RNA_enum_name_from_value.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@46511 954f8c5b-7b00-dc11-b283-0030488c597c
Add new options to PAINT_OT_brush_select, toggle and create_missing.

The toggle option, if enabled, will toggle back and forth between two
brushes. (The first brush of the desired tool type will be toggled to,
running the toggle again switches back to the previously selected
brush.)

If no brush of the desired type is found, and the create_missing
option is enabled, a new brush of that type will be created and set.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@46512 954f8c5b-7b00-dc11-b283-0030488c597c
Modify CCGSubsurf to subdivide an arbitrary number of (float) layers.

The layout of vert data in CCGSubSurf is almost the same; previously
it was three floats (for xyz coordinate) optionally followed by three
floats for the normal. The only change is that the first three floats
can now be any number of floats.

* _getSubSurf takes a numLayers parameter to set the number of layers,
  stored in CCGMeshIFC.numLayers.

* All calls to _getSubSurf currently have numLayers set to 3, except
  for UV subsurf, where it is reduced to 2 (with a corresponding
  change when reading the results out to use float (*)[2] rather than
  float (*)[3].)

* The various VertData* macros in CCGSubSurf.c are now functions that
  take a CCGSubSurf pointer, which provides access to CCGMeshIFC,
  which has numLayers.

* Add ccgSubSurf_setNumLayers() to the API. Only changes the number of
  layers that get subdivided, doesn't change the amount of memory
  allocated. So if space for N layers is allocated, it's safe to set
  the number of layers to less than N, but not more.

* The rest of the changes are just adding the 'ss' parameter.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@46513 954f8c5b-7b00-dc11-b283-0030488c597c
Add CCGKey/CCGElem for accessing CCGSubSurf elements.

CCGKey caches information about the CCGSubSurf element layout. This
data, along with the CCG_* inline functions, allows access to
CCGSubSurf elements with an arbitrary number of layers (as opposed to
the hardcoded DMGridData structure which assumes xyz coordinates
followed by three normal components.)

The CCGElem structure is declared but not defined anywhere, just used
as a convenient type.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@46514 954f8c5b-7b00-dc11-b283-0030488c597c
Replace hardcoded DMGridData structure with CCGElem/CCGKey.

* Changes to DerivedMesh interface: DMGridData has been removed,
  getGridData() now returns an array of CCGElem pointers. Also added
  getGridKey() to initialize a CCGKey (implemented only by
  CCGDerivedMesh.)

* PBVH: added BLI_pbvh_get_grid_key().

* A lot of code is affected, but mainly is just replacing
  DMGridData.co, DMGridData.no, and sizeof(DMGridData) with the
  CCG_*_elem functions, removing the reliance on grid elements of
  exactly six floats.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@46515 954f8c5b-7b00-dc11-b283-0030488c597c
Add DNA and customdata entries for paint masks.

CD_PAINT_MASK is a layer of per-vertex floats for non-multires
meshes. Multires meshes use CD_GRID_PAINT_MASK, which is a layer of
per-loop GridPaintMask structures. GridPaintMask is similar to MDisp,
but contains an array of scalar floats.

Note: the GridPaintMask could be folded into MDisp, but this way
should be easier to add mask layers in the future (if we do fold
GridPaintMask into MDisp, the mask array should probably be an array
of arrays with a 'totmask' field so that mask layers can be easily
supported.)

Includes blenload read/write support for CD_PAINT_MASK and
CD_GRID_PAINT_MASK.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@46516 954f8c5b-7b00-dc11-b283-0030488c597c
Add access to mesh vertex customdata to the PBVH.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@46517 954f8c5b-7b00-dc11-b283-0030488c597c