Blender Git Loki

Dynamic Paint:
* Fix: Wave "timescale" also changed simulation behavior. Now different timescale values will lead to nearly identical results, just slower or faster.
* Added "Displace Factor" setting for vertex displace surfaces. You can use it to adjust final displace strength or use negative values to paint bumps.
* Added clamp/map value to wave image sequence output settings.
* RNA description tweaking.
* General code tweaking.

Camera tracking integration
===========================

Added option to choose which method to use for feature detector: FAST or Moravec

Moravec was supposed to be more "stable", but it collected worse feedback.
before returning back to FAST detector added option to easier toggle between
different detector to compare it's result and find out if we can leave only FAST.

Merging r40960 through r40989 from trunk into soc-2011-tomato

comment own recent memory leak fix since it broke edge slide.

correct collada lib linking order (wasnt building for me), and sphinx doc syntax warning.

Temporary workaround (to unblock a BMesh user) for issue #28869 which is causing a hang when loading some .blend files.

Revert part of recent fix for movie resolution.

It helped to make things works better for some movies but it
didn't help proxies to work properly. Correct fix seems a bit larger
and better not be made atm, so to keep behavior of proxies and
original movie consistent keep resolution behaves like it was before
recent changes,

py docs - gpu module wasn't included in docs.

also added convenience target to build sphinx api docs:
make doc_py

radius interpolation was incorrectly greyed out for 2D curves.

Fix a memory leak in interpolation

Add nodoubles arg to BM_Make_Face

fix for leak when switching between transform rotation modes.

ensure grease pencil layer names are unique when set through rna.

fix [#28898] Segmentation fault when Home key during GreasePencil dopesheet pressed

correct some invalid exception types.

formatting edits & remove debug print.

bpy/rna new property attribute 'data', this means its possible to get back the rna-struct which a property uses.

Without this you cant get the bone from an fcurve data path for example, needed to fix bug [#28889].

Cycles: revert commit that joined surface/volume socket into a single shader socket,
on second thought this makes it a bit too difficult to understand what's going on.

Cycles: code refactoring to split out code from mapping node.

quiet compiler warnings for string formatting in ffmpeg logging