Blender Git Loki

fix for armatures in wire draw mode not displaying in solid mode.

note, this isn't a showstopper bugfix.

Cycles: fix some issues with mix shaders when the weight for an emission shader
was 0.0, and background shader mix wasn't working.

Merged changes in the trunk up to revision 41099.

Fix for a memory corruption bug in knife tool cleanup

added missing call to re-tesselate on mesh conversion (Alt+C).

- Knife tool would switch the knife line to 0,0,0 when not over any geometry, this felt glitchy and while drawing in free space isn't supported 0,0,0 can easily be free space too. So draw a line to the mouse cursor.

- knife tool was missing calls to BLI_array_free()

- add assert for bug [#28960] where dissolve can cause invalid bmesh.

formatting to BLI_array to make it easier to follow, also give line numbers with unfreed memory.

uv select wasn't freeing arrays.

svn merge ^/trunk/blender -r41075:41099

Allow symlinks in user_scripts, this fixes raised exeption in copy_prefs for version_updates

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

Set background to camera axis only when setting it from operator
in clip editor.

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

Allow offset from locked position.

Merging r41037 through r41092 from trunk into soc-2011-tomato

BLENDER_VERSION_CYCLE:
rc > release

Blender 2.60 release commit!

New splash: thanks to Kent Trammell!
And thanks to judges committee: Beorn Leonard, Pratik Solanki
and Brandon Phoenix.

Next: tag & build!

update man before ahoy

fix/update for credits script and bad formatting in sphinx docs.

use CMake's CUDA_NVCC_EXECUTABLE rather then own hard coded CYCLES_CUDA variable.

Cycles:
* Auto detection of CUDA toolkit, using FIND_PACKAGE(CUDA). (Requires at least CMAKE 2.8)

py docs:
added python doc section on script performance and a note on relative file paths in the gotcha's page.
also added script for spell checking py comments.