Blender Git Loki

Subsurf drawing refactoring:

All textured drawing now works correctly using VBOs (with usual CPU
overhead still, but this will be taken care of separately).
Solid texture painting should also work fine.
Renamed ccg GPU functions so they are more consistent with cddm

Merge branch 'master' into opensubdiv-modifier

Merge branch 'master' into temp-derivedmesh-looptri

Merge branch 'master' into temp-ui-widget-refactor

Get rid of uiWidgetType drawing callbacks (which are now used on a lower level)

Let's not use default callbacks for uiWidgetType->draw

Fix drawing glitch with menu items

Use new pipeline for link line drawing as well

BGE: ImageRender for other types of stereo.

Stereo mode disturbs ImageRender by changing some OGL state.
It was already fixed for Quadbuffer mode, but not yet for anaglyph and
interlaced mode. This fix simply clears the color mask and stipple mode
that are specific to these stereo mode. In any case, the correct state
is restored prior the render of each eye.

Merge branch 'master' into temp_display_optimization

minor edits to imb refactor

prefer memset so adding new members doesn't cause uninitialized bugs.

Initialize imbuf options correctly (thanks Campbell)

Cleanup - rename.

Make imbuf flags 16 bits.

We can clean up and decrease flags a bit more now, but left changes
to the bare minimum.
Some flags such as OpenEXR compression are used in DNA as well (should
be fixed at some point)

Merge branch 'master' into temp_imbuf_types_refactor

Bring back missing IMAGIC magic number for header

This is the kind of issue that makes this patch necessary,
magic number was used as format type.

Cleanup: Append IB_FTYPE to all image file types.

Also:

* cleanup unused quicktime file format (it's a movie format, not an
image)
* correct two instances of assigning quality to flags
* Remove jpeg enum from flag definition

Imbuf types refactor

Clearly separate flags from quality in imbuf struct.
Quality stands for PNG compression or jpeg quality.

Also fixed a wrong compression instance in dynamic painting
and commpression setting not propagated when copying
ImBuf to ImageFormatData

Use 4-column layout for editor menu

Patch from T36028 with minor edits.
Note: Renamed "Visual Sequence Editor" to "Visual Sequencer" to fit better into layout.

Also forgot to do commit --amend after fixing some merge conflicts and disabled two failing asserts, so this is a bit more than just the patch.

Merge branch 'master' into UI-experiments

Conflicts:
source/blender/editors/interface/resources.c
source/blender/editors/screen/area.c