Blender Git Loki

RenderBranch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28328:28349 (Note, skipping changes from properties_texture.py)

added option to not restrict effectors based on layer; note it must be enabld on the simulated *object*, *not* the effector

Render Branch:

* Scons compile fix for windows, missing pthread declaration (imbuf refactor commit)

Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28321:28328

Fix crash with speed vectors / raytraced GI / strands combination.

partial redraw clipping planes do not work; I disabled until there's time to debug them (note partial redraw still exists, it's just theoretically not quite as fast)

Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28313:28321

Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28301:28313

excude the over cautiousness, removing changes unintentionally made -r28309, probably harmless but rather match trunk.

reverted link fix yet again til tomorrow, need to find a good way to propegate a pointer to the host main through lib filedata's

missing null check for lamp groups

pointdensity->point_data must be NULL'd on file read

revert 28299 temporarily while I fix it

own stupid mistake in prev commit

Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28283:28301

Render Branch: Fix particle objects instanced from hair having wrong
transform when rendering.

allow linked or appended files to themselves link data from the host .blend

Render Branch: Fix SSS scale + node material problem.

Render Branch: SSS scale can now be textured.

Updated rigify scripts for minor driver api change.