Blender Git Loki

== VPaint ==

* Re-enabled all the vpaint tools except for blur
* Also added alpha blending modes
* Removed dead code

TODO:
* Combine the add and erase alpha modes, only separate for now to match the IMB_BLEND modes more easily

== VPaint ==

Removed non-PBVH vpaint.

== Multires ==

* Renamed Sculpt Level to Edit Level (works now for vpaint too)

== Multires/VPaint ==

Enable multires painting.

* Added operator/RNA/UI to toggle multires for vertex colors. (UI is not great right now, just a button in mesh data properties.)
* Added layer names to GridKey. These are used (in combination with CD type) to identify the source layer from CustomData.
* Changed default mcol to white with alpha=0
* Renamed CD_FACEGRID to CD_GRIDS, removed CD_DISP
* Added a new CustomDataMultires type (CD_GRIDS), which stores layered data like CustomData. However, it only stores float types, and is very simplified.
* Reworked PaintMask to use the new CD multires stuff, also used for vertex colors.
* Started changing vpaint to internally use floats.
* Layering support for multires vpaint. Layer alpha is used to combine the output.

TODO:
* Doesn't handle layer renaming yet (so if you rename your mcol layer, it'll disassociate from the multires data)
* Layers for non-multires vpaint
* Default mcol layer in the startup blend has full alpha, so for testing layers you have to delete the default mcol layer and add new ones.
* Multires level in vpaint is controlled by the Preview level

== PBVH ==

* Moved glShadeModel from pbvh.c to gpu_buffers.c, also fixes bad include of glew

== Multires ==

Some refactoring to support vpaint

* For multires_mark_as_modified, make sure the DM is a CCGDM first
* Make the gridkey a parameter to various functions, rather than using the same one everywhere.
** Most important, when doing a multires update, enforces use of the same gridkey as the DM its updating from.

== VPaint ==

Added partial redraw to vpaint.

Updated the PBVH docs in the wiki to include some info about partial redraw:
http://wiki.blender.org/index.php/Dev:2.5/Source/Modeling/PBVH#Partial_Redraw

* Moved some sculpt-pbvh functions to paint_util for general use
** sculpt_get_redraw_rect -> paint_get_redraw_rect
** sculpt_get_redraw_planes -> paint_get_redraw_planes
** Some of the code from sculpt_flush_update is now paint_tag_partial_redraw
* Added some debugging code to show the area being redraw during partial redraw
** Draws a box around the area being updated
** Set rt to 444 to see it

== 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

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.

svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r30167:30324

Changed glew include from "" to <>

== New VPaint ==

* Make disabling All Faces option work. This is a little different from old vpaint, but basically it just fills in whatever face is under the brush. Unlike old vpaint, all corners are filled the same way.
* Display of this feature isn't too good right now. It may look like the colors are being assigned to the wrong face, or not at all. This is just due to the way VBOs are being filled though; switching temporarily to old vpaint shows the colors are on the correct face.

svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r29912:30167

* VPaint brush strength works again
* Finally fixed the mesh-turns-orange problem with glColorMaterial

Begin updating vpaint to use the PBVH
* Added a new flag (plus RNA/UI) to switch between old vpaint and new vpaint
* For new vpaint, draw using the PBVH. Lighting is enabled for new vpaint.
* Note that the full model is still being redrawn, partial redraw isn't enabled yet.
* For new vpaint, use the PBVH to determine which faces to paint on. Only mix brush works right now.