Blender Git Loki

Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r29216:29245

Render Branch: temporarily revert commit 29079 from trunk with particle
path changes. This is causing two problems (reported in tracker):

* hair doesn't move when transforming e.g. an armature parent
of the mesh emitting the hair.
* particle duplis on hair (for feathers) are not rendering.

== Stencil Buffers for Linux & OSX ==
I attempted to change GHOST to request stencil buffers for Linux and OSX. I can not test these changes at this time, so please patch if it doesn't work.

* Changed GHOST to request at least 1 stencil bit, and give zero weight to any pixel formats that don't. Only did this for Win32
* TODO: Make sure that Mac OSX and Unix also get stencil buffers. I have no experience in those window systems.
* The above change was so that stencil could be used to draw the brush directly on the surface of the model
* TODO: Show Brush On Surface can only work if there is an up to date zbuffer, but the zbuffer is discarded after the first frame it is used so the brush does not show after you move the mouse.

Render Branch: improve least squares reconstruction for irradiance cache,
in cases where it is underdetermined (few samples points). Hopefully solves
flickering in some of the mountains that we have here.

Fixed rna padding issue.

* disabling symmetry feathering and clipping. more research is needed before I can make it work right, dropping it until later
* "Lock Brush Size" takes the current brush size, and keeps it the same size no matter how the object is viewed.
* Zooming in and out dynamically resizes the brush retical. This also lays the foundation for a fancy brush retical ala Sculptris
* commented out a couple of unused fields from struct Sculpt. This struct adds so little, should be unified with Paint later
* made the hard limit for brush size 1-2000, to allow it to grow to larger than the screen when using lock size. UI soft limit is still 1-200

Render Branch: post-sim correction for hair bendiness, doesn't work
very well in my tests, but perhaps better than nothing.

Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r29214:29216

Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r29182:29214

*angry face*

Misplaced curly brace.
Replaced BRUSH_BIT macro because my prefered name BIT was taken.

Merged Unlimited Clay 29142-29190
Cleaned it up so that it compiles with MSVC.

Merged Trunk: 29143-29201
Merged object_edit.c: 28971-29201

* symmetric sculpting now feathers the strength of brushes near symmetry planes (unfinished)
* fixed crash bug in the inflate brush
* redid brush bitflags to use a macro, tired of typing in large integers
* added checkbox to enable/disable adaptive strength reduction based on spacing
* fixed confusion between use of SculptCache::symmetry and SculptCache::symmetry_pass
* changed do_brush_* functions to use math library functions instead of doing the math inline

svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r29022:29193

COLLADA branch: fix bug #22388.
Do not create multiple armatures when multiple controllers share armature.

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.