Blender Git Loki

Merge branch 'master' into soc-2013-paint

Conflicts:
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/editors/uvedit/uvedit_draw.c

Fix crash when entering texture paint mode in cycles with image editor
open.

Merge branch 'master' into soc-2013-paint

Fix crash reported on irc by nudelZ, entering texture paint mode in
cycles crashes. Ensuring data does not work in node materials, don't set
image on image editors.

Part of previous request:

Always display uv layer of active texture paint layer in uv editor.

xrg feedback request series #2:

Set the image of active paint slot of the active material (of the active
object of the active scene...phew! :p) in image editors when entering
texture paint mode.

+ some minor identation fixes.

2D painting UI:

Expose Image Paint Panel under Options Tab that includes unified paint
settings. Moved wrap option there as well (I think it makes sense for
this to be a paint option instead of a brush option but leaving for
later)

xrg feedback request series:

Unified color option. This only unifies background and foreground
colors. I think gradients are too specific tools to be unified across
brushes.

xrg feedback bugfix series #1:

Fill tool does not utilize blend modes.

Merge branch 'master' into soc-2013-paint

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

Merge branch 'master' into soc-2013-paint

Conflicts:
source/blender/blenloader/intern/versioning_270.c
source/blender/makesrna/intern/rna_brush.c
source/blender/makesrna/intern/rna_internal.h

Do delayed cleanup of palette colors because they are still used still
by the interface after deleting. Now just tagging for delete on next UI
refresh.

Fix sample color not using the correct UV layer when texture slot used a
custom layer

Fix solid mode viewport texture painting overtrying to upload textures

Fix silly mistake.

Deleting all curve points led to invalid memory access.

Move stroke method shortcut to E key to resolve conflicts in mask/paint
curve modes.

More guards and fixes for paint curve keymaps/transform for 2D editor

some more guards against transform "leaks"

Force curve pivot to be around center always (this will fall back to
local for 1 selection leading to nice point rotation/scaling otherwise)