Blender Git Loki

Tweaking Clay and Contrast Brush

Fixed bug in clay (miscalculated the flatten plane)

Added Contrast, Scrape, and Fill brushes.

Added Contrast, Scrape, and Fill brushes.

Fixed syntax error. Added contrast, fill, and scrape brushes.

* Added a few new customdata types:
* FACEGRID will be the new way all CustomData for multires gets stored. Its backing type is CustomData. It's intended to be used in the CustomData for mesh faces. This is similar to CD_MDISPS, except that instead of storing just triples of floats, we can store a grid for any type (so long as there's a CustomData layer for it.)
* CD_DISP will be the replacement for CD_MDISPS. It's a triple of floats.
* PAINTMASK is simply a layer of floats; will be used to describe the intensity of the mask at each vertex (or at each grid point for multires.)

* Added a temporary operator to set masks, does nothing yet
* Added a temporary UI for the temporary operator for testing

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

Fixed clay and flatten brushes.

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

Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28957:28959

Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28949:28957

own merg from trunk broke tiff loading r28950

Render Branch: manual merge from commit 28949, merging -r28890:28948
Brecht: please check tiff.c, still has minor change compare to trunk, not sure this is intentional.

also copied netrender repath module.

Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28890:28948 (missing release/scripts/modules/add_object_utils.py and changes from source/blender/render/intern/source/texture.c source/blender/render/intern/source/rendercore.c source/blender/makesrna/intern/rna_scene.c source/blender/imbuf/intern/tiff.c), will manually merge next.

ffmpeg was computing the frame length of avis via doubles,
but was not properly ceiling them, sometimes resulting in truncation errors.

durian featurette: ^Cmekey in anim editors now respects scene/preview frame range. merge with trunk will happen if Aligorith approves this. implemented view-all in the NLA editor btw, and fixed a bug where shift-select didn't work

=New feature: material id renderpass=

Works exactly like the object id pass; to use,
assign a Pass Index in the material Options panel.