Blender Git Loki

== Sculpt ==

* Added back mask brush, accidentally removed during last merge
* Removed an incorrect assert in paint mask

svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r30722:30764

svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r30668:30722

Render Branch: remove centmask/centLut lookup optimization for finding
subpixel position from a mask. It's not working correct for OSA != 16,
and can result in light leaks with raytracing in that case.

Render Branch: paths tweak, don't look in local directory for USER scripts.

Merged 30731-30741
nicholasbishop finished up his work fixing up brush icons

== Sculpt/Paint ==

* Fixed a crash on loading files with a paint mode active
* Fixed a type warning

* was suggested I combine all the direction modes into a single enumeration by using RNA_def_property_enum_funcs

syntax error in rna_brush.c

Merged: 30689-30730

Merge with trunk: 30300-30688
* default object in startup.blend set to draw matcap as max mode

== VPaint ==

Enabled textures for vpaint brushes. Not all of the texture options work yet.

== VPaint ==

* Updated non VP_AREA painting for both regular and multires meshes. Still looks bad because of drawing issues though.

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