Blender Git Loki

== Sculpt ==

Fix for some brushes exploding

* Replaced partial initialization of pbvh iterator with memset (this was how it was originally, probably changed after merging from trunk some time I guess)

svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r30563:30668

== Multires ==

Small bug fixes

* When dropping down to multires level zero in sculpt mode, update PBVH from the CDDM
* When checking for modifiers in sculpt, ignore multires on level zero

Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r30470:30620

OSX/Cocoa : fix crash when opening/saving .blend with accented characters in their filename

svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r30510:30563

== VPaint ==

Work-in-progress, vpaint + multires. This commit just adds gpu drawing and vpaint editing of the multires colors through the PBVH. The colors aren't stored or subdivided yet though, so as soon as you switch levels or otherwise rebuild the PBVH the painted colors will disappear.

svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r30325:30510

svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r30324:30325

Nasty merge conflicts in editors/sculpt_paint, probably made some mistakes. Will finish merging to latest trunk before fixing bugs though.

* spelling error, "substract"

* new factory defaults include Eclectiel's sculpt icons and new default brush settings for the new tools

* decrementing image_icon ref count from wrong place

* was converting the space factor for files subversion 5 from pixels to radius but some version 5 files are pixels and some are percentage so I'm gonna only touch even older files to be sure I do not convert any body's percentage setting that was already a percentage. This means that some settings as pixels won't get converted by I think thats ok.

* fixed crash when there is no active brush

* fixed crash when there is no active brush

* fixed crash when there is no active brush

* Reverting change to zoom in MatCap. I think the problem with artifacts on the edge must be either a bad MatCap or another problem and it shouldn't be covered up

* The area inside the MatCap texture is shrunk by 0.95 to help eliminate artifacts on the edges of object when using a MatCap
* Object Color is enabled in the MatCap material so that setting an objects color will tent the object that color. You can set an object's color in the Object panel on the right.

Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r30448:30470

* I do not care how much it bugs you never change the capitalization of a file in version control it is just asking for trouble.