Blender Git Loki

Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r29150:29182

print's in pointcache were slowing down bake (renderbranch only)

Render Branch: Fix #22412: crash rendering with octree for raytracing.

Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r29132:29150

Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender/source/blender/render -r29104:29132

Render Branch: multires external files can now be loaded, previously
it would only save to the new location when changing the path.

Render Branch: lamp halo's can now be textured. Had to reorganize the
code to separate cone intersection, integration between intersections,
and shadow/texture lookup.

Render Branch: fix crash cancelling render while building object instance
in raytree, object could still be added after it was already freed.

Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28984:29104

fixed crash in quadview

fixed object id bug

Fix indexMat typo and linking problem on Linux with make.

Render Branch: hair collision time stepping test. Not sure this is much
better than before but it helps in some cases. It seems to me that
without this it is taking 1.5 steps each time instead of 1.

The original paper defines vi+1/2 = (xi+1 - xi)/dt, but in our case we
already have vi+1 = (xi+1 - xi)/dt ... so there's a conflict here.

Render Branch: fix missing hardness property for Cook-Torrance in UI.

Render Branch: make hair particles also support drawing their number next
to them, previously this only worked for regular particles.

Render Branch: for hair collisions, always treat quads as split into
triangles for intersections, solves some issues.

Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28978:28984

Render Branch: bring cloth solver code a bit more in line with trunk again

* goal code using springs is now enabled again by default for cloth, with
an option to use the different goal code available.
* hair collisions now update tv instead of tx, just like cloth does.
* extra collision solve step is only done if necessary again.

Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28971:28978

Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28959:28971