Blender Git Loki

Merge branch 'master' into wiggly-widgets

Conflicts:
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/include/ED_view3d.h
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/makesdna/DNA_view3d_types.h

Merge branch 'master' into wiggly-widgets

Conflicts:
source/blender/blenloader/intern/versioning_270.c

Add second widget call in-scene

Fix error in last commit

Separate widget drawing to update and draw phase to make in-scene widget
drawing possible (need to update once, draw twice).

WIP code to use in scene drawing for widgets.

Fix warning in py code.

Merge branch 'GPU_subsurf' into wiggly-widgets

Conflicts:
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/gpu/GPU_buffers.h
source/blender/gpu/intern/gpu_buffers.c

Fix some ordering issues, remove leftover glBegin/glEnd

Initial VBO code for GPU subsurf.

This commit adds a few generalizations to the VBO
code so that modifiers can create and populate their own GPU objects.

The VBO code originally supported CDDerivedMesh only. The design moves slightly
towards the viewport refactor where the rendering system requests data from the
modifiers.

In this commit only basic support for vertices and normals is provided and
some features from blender's VBO system, suchs as mapping to original faces,
unique element indices for vertices and loose vertex/edge support are missing.
Also, the quick navigation feature of the subsurf modifier won't be supported
for now.

What we do have is full support for solid shading with multiple materials,
flat/smooth shading and a big performance boost.

Merge branch 'master' into wiggly-widgets

Conflicts:
source/blender/blenkernel/intern/customdata.c
source/blender/makesdna/DNA_customdata_types.h

Move priority of widget handler back for node editor. Still not very
clean but should allow gooseberrians to work a little better

Initialize dropboxes and widgets together before opening the homefile,
makes sure areas get their proper handlers registered

Merge branch 'master' into wiggly-widgets

Conflicts:
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/object/object_intern.h
source/blender/editors/object/object_ops.c
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/makesdna/DNA_customdata_types.h
source/blender/makesrna/intern/rna_object.c

Cleanup the file mess with facemaps, make correct BKE/ED files for all
functions. Blenderplayer compiles again

Little experiment: hook up a transform operator to a bone facemap. For
now moves the mesh only, doesn't set the bone as selected.

Facemap widgets:

* Only draw on mouse over
* Fix crash with highlighted widgets.

Modify facemaps mapping to bones.

Now simply add a flag to the armature modifier to use facemaps. Facemaps
on the mesh object with the same name as the armature bones will get
displayed as widgets.

Merge branch 'master' into wiggly-widgets

Facemap bones now draw properly. It's not possible yet to select the
bones so use with caution.