Blender Git Commits

Merge branch 'master' into soc-2013-paint

Also includes follow up to fix for T39412

Conflicts:
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/makesrna/intern/rna_brush.c

Merge branch 'master' into soc-2013-paint

Conflicts:
source/blender/editors/sculpt_paint/paint_image.c

Merge branch 'master' into soc-2013-paint

Aargh! More crash fixes!

Fix issue with curves crashing in texture paint mode. Also only do curve
manipulation if a curve brush is active (some modes actually use
transform for other things as well)

Add select all (A Key), scale (S Key) and rotate (R key) operations for mask points.
Also add extend selection with shift-select.

Reusable curves for the paint systems:

This commit includes the following:

* Per brush curve setting that allows setting a different curve per brush.
Those curves stay in memory and can be edited and reused accordingly.
To make sure that a curve is saved in a file users need to add a fake user,
similar to other datablocks.

* Interface while using curves is now non blocking. Users can pan, rotate,
and zoom the view while able to select and edit curve points as previously
in the GSOC branch.
Code internally uses the transform system. This needs some tweaking still
but it should be similar to the previous GSOC system. This may change
in the future to be more compatible with other curve systems
(ie enable choosing handle type etc.)

Fix issue with 'swimming' mask textures in 2d painting.

Make width of lines smaller.

* Use better OpenGL calls for curve drawing

* Draw handles for polylines/lines

Merge branch 'master' into soc-2013-paint

User request: Selecting a slot in the layer panel in projective texture
painting will set that texture in the image editor.

Better fix for sampling adding new palette colors. Projective texture
sampling was still buggy.

Merge branch 'master' into soc-2013-paint

Change to naming - not layers, slots! Will be good not to confuse those
because real per-slot layers will be implemented later.

* Correct icon for strength space attenuation.
* Finish data ensurance code for texture paint. On entering projective texture
paint mode, a uv layer, material and diffuse slot will be generated to paint
on if they are missing.

I am not totally happy with how the paint images are cached on the material.
It may be better to store in a per object paint session or toolsetting imapaint
struct. Still this works.

Somehow git managed to do this great thing on that last merge. Fixing.

Merge branch 'master' into soc-2013-paint

Merge branch 'master' into soc-2013-paint

Speedup for 2D painting: Use partial update for mask textures.