Blender Git Loki

Render Branch: displacement now preserves smooth normals from the base mesh,
which got lost due to linear subdivision. It now does this:

final normal = displaced normal + (base mesh normal - subdivided normal)

Render Branch: linked groups object matrix and data evaluation no longer
happens in group space now, but in scene/world space. This ensures e.g.
gravity goes in the right direction if the group is rotated, or collision
with objects outside of the group works. This only works correct if there
is one instance of the group, but that was the case already.

This also fixes collision with objects in groups not working, and removes
some object_handle_update calls that should no longer be needed in 2.5.

missed this in the merge too

fix for merge error

svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r27666:27705

fix for mistake in own recent commit.

fix for crash on loading some files with composite nodes.

workaround for compositor threading copying actions every time.

error when reordering function

Fix makesrna crash due to missing object_type_curve_items sentinel.

re-order some args to be more consistant with the previous commit

rna/py-api fix.
C functions and python used different argument order, this relied on mapping non-keyword arguments to 'REQUIRED' arguments but meant that you could not have an optional, non-keyword argument.

next commit will make order of arguments consistant (currently only changed order that rna wrapped).

Render Branch: lamp distance drawn in 3d view now takes into account
color management so that the cutoff is really at 0.01 of the intensity.

report an error parsing args, will try fix properly but this involves many changes so do this for now.

fix for parsing python args to rna functions, was using allocated size as argument count.

Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r27654:27666

py/rna functions for adding and removing curve data.

getting an item from a collection wasnt being checked correctly.

bugfix for loading objects saved with the dupli pointer set.

svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r27592:27654