Blender Git Loki

Merge -c 26897,26932 from COLLADA branch into trunk.

Fix #21116: wrong shortcut key in view navigation menu.

rigify panel, ignore removing a bones type when its not found

Fix #21073: toggling image premultiply did not reload image.

Fix #21078: image paint undo didn't work correct with wrap option, moved
wrapping code to paint_image.c so it can be used for the undo push.

support for camera shift with UV camera project.

make it so an error registering/unregestering wont stop loading scripts, just print the error and continue

Patch: [#20408] Bugfix GLSL shading with VBO
Thank you, Andre Tibben, for the fix.

classes were having their dictionary cleared when the blender extension data was freed which made re-registering fail.
now extensions can be enabled and disabled without having to reload them.

[#21141] boring segfault on F8/"reload scripts", 26878, backtrace
reloading bpy_types was causing reload to fail. also unregister all modules in the reverse order that they were loaded, so when reloading removed files done hang around.

OSX/CMake : fix ffmpeg include path

OSX/Scons cleanup : remove option to build with extern/ffmpeg and old python 2.5 options

bug #21160, misspell in align objects operator

Inline tooltips and descriptions of export/import
Random fixes and tweaks in names and tooltips

Fix memory leak "dist table" in node curve mapping.

GLSL: fix some notifiers for scene settings and remove unneeded check.

[#21023] 2 Dynamic loading patches (one bugfix, one feature)
patch from Mitchell Stokes (moguri), only the bugfix part for now.

copy animdata and id-props when copying material node tree's to avoid double memory frees or node trees sharing animdata when they shouldnt.

Fix very long render time when using a large filter size with the new
image sample code. I've added a dumb clamping now of dxt/dyt, probably
could use a smarter solution but it's not likely to be noticeable.

rename euler_filter.py -> fcurve_euler_filter.py
check if the .Blog file exists rather then using an exception.