Blender Git Loki

Remove tag for retag

== Ptex ==

Missed a conflict in my last merge

svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r31667:31833

== Ptex ==

* Fix blur tool on mesh border

== Ptex ==

* Fixed blurring brush to work with ptex
* Added a convert operator to convert ptex data between 8-bit, 16-bit, and float

Still has some issues; blurring 8-bit data darkens it, and there are small seams between tiles

COLLADA branch: merge from trunk -r 28015:31610.

svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r31488:31667

COLLADA branch: support <instance_node> import. Fixes bug #21954.

change from r31533 (Ton hasn't got the render branch)

== Ptex ==

* Added subface hiding and subface masking to ptex edit mode
* Added hotkeys and menu items (HKEY and alt+HKEY for hiding and unhiding, MKEY and alt+MKEY for masking and unmasking)

svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r31296:31488

== Ptex ==

Resolution editing works now with VBO enabled

== Ptex ==

Enabled VBO drawing for ptex paint

== Ptex ==

* added an operator for removing the active ptex layer
* added a save operator for ptex layers. Note that it doesn't save adjacency data yet (doesn't affect painting, but needed for renderer filtering)

== Ptex ==

Fixed grid artifacts when painting on subdivided mesh

== Ptex ==

* Moved ptex loading and resolution changing into BKE ptex
* Renamed "vpaint" stuff to paint ptex and moved it into paint_ptex.c

== Ptex ==

Brought back ptex resolution editing

Improvements:
* For nonquads, subfaces can now be directly selected, so there's no need to display multiple resolutions for triangles
* Display and selection use the same pbvh as for painting, so for example subsurf shows correctly

== Ptex ==

Missed a file

== Ptex ==

Changed the internal ptex format to always use subfaces

* Changed MPtex to references MPtexSubfaces, each of which is a quad with U and V resolution and it's own ptex data pointer.
* This format is basically the same as what triangles were already using, but now quads work the same way.
* This format is also closer to the way multires grid data was already stored.
* Ptex loading (and saving, once that's implemented) requires some extra work to convert to the internal format, but everywhere else the code is much simpler.
* Fixed undoing ptex changes on a different multires level from where they were painted.
* Ptex paint now always uses an all-quad DM (generated with one level of ccgdm simple subsurf.) This is a bit ugly, just stuck on the end of calc_mesh_modifiers. This is only done if there's no multires or subsurf modifier at the end of the stack.
* Resolution editing is disabled for now, will restore it in next commit

Merged GPUDrawFlags into DMDrawFlags, cleaned up DMDrawFlags