Blender Git Loki

* Fix: grab brush got foobar'd by a previous merge

== Multires ==

* Fixed a memory leak when deleting multires data

svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r30795:30846

== Paint ==

* More texture refactoring; brush texture symmetry now works properly in sculpt mode again, also works in vpaint now.

TODO:
* Fixed texture mode doesn't work in vpaint
* Anchored brush needs updating

== PBVH ==

* Some interface cleanups, should be no functional changes

== PBVH ==

Note to testers: if you couldn't see colors or masks before, this should fix it.

* Updated non-VBO drawing for colors; paintmasks and vertex colors should now work OK with VBO disabled (or for OOM condition)

== VPaint ==

* Fixed going into edit mode losing multires color data

Merge with trunk: 30741-30831
Mistakenly forgot to commit the merge before adding the following feature:
== Wrap Texture Mode ==
Texture map coordinates are local to the brush instead of projected from the screen.

== VPaint ==

* Blur brush works for multires now

== VPaint ==

* Implemented blur brush for non-multires models

== VPaint ==

* Removed some code cruft and out of date comments

== Paint ==

* Replaced sd->flags with paint->flags

== Paint ==

* Changed SCULPT_USE_OPENMP to PAINT_USE_OPENMP

== VPaint ==

VPaint symmetry enabled. Made a lot of changes here; hopefully nothings broken as a result.

* Sculpt had a ton of symmetry code; moved most of it into the PaintStroke system
** Added a couple new PaintStroke callbacks, one for updating symmetry data in case a paint mode has local data that needs to be flipped or rotated (sculpt does), and one for applying a brush action (one brush action per symmetry "dab")
* Ported sculpt's symmetry code to the new system
* Added symmetry support to vpaint

TODO:
* Symmetry for brush textures still needs to be updated

== VPaint ==

Masking for vpaint

* Enabled combined display of masks and vertex colors
* Added mask painting to vpaint
* VPaint factors masks into strength
* Added functions in BKE paint to find the combined mask value for an element

TODO:
* Because vpaint doesn't have proper undo yet, and mask painting is shared between sculpt and vpaint, undoing the effects of the mask brush is disabled for now.

== VPaint ==

* Changed add vcol operator to not duplicate previous layer's data
* Updated pbvh mesh drawing to work with layers (still requiring VBO though)

== VPaint ==

* Merged the two alpha brushes into one, added RNA/UI for switching between adding and erasing alpha

svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r30764:30795

== Sculpt ==

* Removed the mask brush, replaced with a BRUSH_MASK flag
* Added RNA/UI for that (UI is a checkbox in the brush panel)

TODO:
* For now, all brushes behave the same in mask mode; some brushes should have special behavior (e.g. smooth should smooth the mask)

== VPaint ==

* Enabled fast navigate option for vpaint
* Moved fast navigate UI button back to options panel for now
* Fixed vpaint partial redraw, wasn't actually passing the redraw planes in