Blender Git Loki

Some more changes for improving non-sculpt paint modes:

�?� Add face customdata to the pbvh
�?� Return more data from BLI_pbvh_node_get_faces
�?� Add some drawing flags for the pbvh/VBO drawing code
�?� Some initial support for drawing mesh colors (not used yet)
�?� Abstracted sculpt's get_location a bit so it can be used for other types of paint strokes
�?� Moved and renamed unproject_brush_radius so other paint modes can use it
�?� There should be no visible changes from this commit

Some preparation for accelerating other paint modes than sculpt

* Replaced Object.sculpt with Object.paint. This new PaintSession type for now just contains the PBVH so it can be built more or less the same for different paint modes. It also contains the old SculptSession data.
* Removed a couple of unused fields from SculptSession.
* Changed a lot of sculpt functions to pass around the Object rather than SculptSession; made sense anyway because we added an Object field to SculptSession to work around that problem.
* There should be no visible changes from this commit.

Experimental feature, multires apply base, as suggested by renderdemon

* Attempts to fix the "spike" problem with multires
* For example, take the grab brush and pulling a large chunk of the mesh around will create ugly spikes at lower levels
* Another problem is that a multires mesh heavily changed in sculpt mode will still have the original shape in editmode, which might not be very useful
* Solution here is a new operator "Apply Base" that modifies the mesh to conform better to the sculpt multires mesh.
* Like applying the modifier, this changes actual mesh data, not disps
* Some attempt is made to avoid shrinking the base mesh too much, but the algorithm used is just my guess based on how catmull clark behaves
* So far as I know there are no published algorithms for correctly reversing catmull clark when the subdivided mesh has been deformed

svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r29790:29912

* Added DNA/RNA/UI for enabling and disabling mask layers.

Added a new mask operator to create a mask from a texture.

* Moved get_texture value out of MOD_util and into BKE texture
* Added a new pbvh function similar to get_grids but for faces
* The new operator should work for ORCO and UV mapping
* UI is just a new menu item in the drop-down menu next to the texture slots list
* Also fixed a crash in the mask_set operator where sculpt's PBVH wasn't updated

* Fixed masks not updating after undo

Make mask opacity actually do something; I had forgotten to update the PBVH iterator to take mask opacity into account.

Made mask layer's opacity adjustable.

* Added a new "strength" field to CustomDataLayer, set to 1 by default.
* Added RNA for strength; the update function is ugly, commented in the file
* Added a slider control to adjust strength

Some cleanups and optimizations for masks:

* Mesh/grid VBO buffers can now be updated separately for coord/normal data and mask data
* Added a typedef for GPU_Buffers so we don't have the void* cast
* Changed the PBVH update to allow separate updating of mask data
* Fixed a memory leak for the mask_set operator

* Moved subsurf grid stuff into it's own header file
* Changed gridkey in CCGSubsurf to not be dynamically allocated
* Fixes at least one small memory leak

svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r29583:29790

Fixed paint masks + multires going into and out of editmode; wasn't setting the right number of grid elements when copying face grids.

Fixed uninitialized variable.

Multires+mask bugfixes:

* Crash when changing modes from sculptmode
* Crash when adding multires modifier on a mesh that already has paintmask layers
* Smooth brush eating holes in a mesh without a paintmask layer

Added undo pushes for the mask_set operator. Also removed a bunch of old crufty declarations in sculpt_intern.h.

Enabled multiple paint mask layers for both regular and multires meshes.

* Iteration over vertices in the PBVH now has two mask components, the active mask, which is editable by the mask brush, and the combined mask, which adds all the mask layers together (clamped to [0,1]), and is used to mask off other brushes
* Layer adds and removes are handled by the paint undo system used in sculpt mode
* Added a new customdata function that adds a layer at an offset (into other layers of its type.)

More changes in prepping for mask layers:
* Reversed direction of mask strength
* Changed subsurf_make_derived_from_derived to take a gridkey parameter, or NULL for the default key (just coords + normals)

svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r29453:29583

* Added paint mask mask to editmode mask so it's not destroyed when going into editmode.