Blender Git Loki

COLLADA Armature bake animation export fixed( needs more testing )

fixed typo

Armature bake animation export ( not as pose matrices. Still needs fixing )

simplify x11 path code, had unneeded NULL checks and std namespace

ndof data change: operators can access values as vectors or components, as both are handy

Fixes a memory allocation problem
Uses functions that reduce duplicate code for clearing/recalculating deformations.

removed old ndof transform code, to be replaced with modern stuff in 2.6

scons patch from jensverwiebe
fix a silly bug in version detection, - added an OSX sdk-check

jensverwiebe, needs to get commit access!, but will apply his patches for now.

stricter WITH_INPUT_NDOF guards, general cleanup

fixed ndof library detect for Mac SCons, ndof enabled by default (disabled if lib not found), minor cleanup

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

Corrected focal length initialization. Now it'll be 24mm, not 24px.

Merging trunk up to r39145.

fix for building ndof with cmake on osx

Changed do_version condition for noodle_curving.
It should be re-set to 5 for files saved in 2.58.1 release.

Cycles: svn merge -r37957:39132 https://svn.blender.org/svnroot/bf-blender/trunk/blender

change TODO -> BMESH_TODO if only on bmesh branch

Nla Sound Strips + Add Speaker

Second part of previous commit. Now, when speaker objects are created,
they are created by default with an NLA sound strip so that it is easy
to just start immediately using this to do cool stuff (i.e. timing
when you want the sound to start).

Sound clip NLA Strips for Nexyon

These are basically just for specifying when a speaker should fire off
it's soundclip, and as such, many NLA operations are irrelevant for
it. They can only be specified on object-level for speaker objects.

I've still got some UI tweaks I'll need to work on in order for these
to be able to be added even when the speaker doesn't have any NLA
tracks yet. (EDIT: while typing this, I had an idea for how to do
this, but that'll be for next commit). In the mean time, you'll need
to add a single keyframe for the object, snowflake that action and
delete the NLA strip before you can start editing.

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

Request from some artists and initial idea: own frame scrubber for clip editor.

- Display current frame number in small rectangle near current frame marker
in clip editor.
- Mouse can be used to change current frame. It is almost the same as
for timeline. Changing of frame happens when mouse is slidding in 16px
height area in the bottom of clip editor.

Merging r39121 through r39134 from trunk into soc-2011-tomato