Blender Git Loki

Merge remote-tracking branch 'origin/master' into soc-2014-bge

Merge branch 'master' into opensubdiv-modifier

BSpline basis (derivs 0,1,2), BSpline surface (derivs 0,1) fix + verification in Mathematica

Cycles: Memory optimization for shader id.

Pack the shader ID into the vert index float4 (which still had one empty component).
This way we save 1 float per mesh triangle.

As a bonus, this gives 1 GPU image texture slot back to sm_2x users.

Merge remote-tracking branch 'origin/master' into soc-2014-cycles

Merge remote-tracking branch 'origin/master' into soc-2014-bge

cleaned cmakelists file

unused plugin files removed

Don't draw shape key values in Absolute mode

OpenSubdiv: A bit of optimizations

- Use OpenMP for updating coarse normals and positions.
- Update coarse opsitions of GL Mesh only when it's needed.

convert to objects fix: now should take textures into account too

windows compile fix: replace BLI_temporary_dir() by BLI_temp_dir_base()

fix for: fix normals, can use modifiers before fracture now too to get correct result

Eval debug rig

revert last change again, was just a test

gitmodules test

Merge branch 'master' into opensubdiv-modifier

More functionality review fixes.

* Fix context issues with paint curve keymaps.

* Make paint curve cursor set operator modal.

Bring back select mouse tweak trasform, needed for image editor curves.

active pivot works in paint transform. It uses the centerpoint of the
last selected curve handle.