Blender Git Loki

Merge branch 'master' into gooseberry

Conflicts:
source/blender/blenkernel/BKE_context.h
source/blender/editors/include/ED_transform.h
source/blender/editors/transform/transform_ops.c

Shapekey widget is correctly bound to the shapekey property and controls
it.

More cleanup to the widget API.

Now with RNA pointer copy we don't need to allocate RNA pointers
anymore. The API is much more streamlined and is almost like the panel
API.

Widgets: Cleanup, no draw flag now, widgets are fully dynamic. Also
calculate scale always to make sure interaction happens correctly.

Refactor widgets to always be recreated on redraw - like buttons.

This allows us to spawn a different number of widgets per frame, which
will be needed for shapekey doritos. Also added a widgetgroup for the
shapekeys

Merge branch 'master' into gooseberry

Add stub operator for widget operation so it is blocking and events do not get
lost when region changes.

Merge branch 'master' into gooseberry

Merge branch 'viewport_experiments' into gooseberry

Conflicts:
source/blender/gpu/intern/gpu_buffers.c

Merge branch 'master' into viewport_experiments

Conflicts:
source/blender/editors/space_view3d/view3d_draw.c
source/blender/gpu/GPU_buffers.h
source/blender/gpu/intern/gpu_buffers.c

Revert "Hook up flags to request a specific sorting scheme from GPU buffer setup"

This reverts commit 827ad6075dcf144025db7c4319e9954dcf45b26c.

Merge branch 'master' into gooseberry

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

Merge branch 'master' into gooseberry

Merge branch 'master' into gooseberry

Merge branch 'master' into wiggly-widgets

Merge branch 'master' into gooseberry

Conflicts:
source/blender/editors/space_view3d/view3d_draw.c
source/blender/gpu/intern/gpu_extensions.c

Merge branch 'master' into viewport_experiments

Conflicts:
source/blender/editors/space_view3d/view3d_draw.c
source/blender/gpu/intern/gpu_extensions.c

Merge branch 'master' into gooseberry

Conflicts:
release/scripts/startup/bl_ui/space_sequencer.py
source/blender/blenkernel/BKE_sequencer.h
source/blender/blenkernel/intern/sequencer.c
source/blender/blenkernel/intern/sound.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_ops.c
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/editors/space_sequencer/sequencer_edit.c
source/blender/editors/space_sequencer/sequencer_intern.h
source/blender/editors/space_sequencer/sequencer_preview.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/space_view3d/view3d_ops.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_snap.c
source/blender/makesdna/DNA_space_types.h
source/blender/makesdna/DNA_view3d_types.h
source/blender/makesrna/intern/rna_space.c

Merge branch 'master' into wiggly-widgets

Conflicts:
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/space_view3d/view3d_ops.c

Fix compilation error with SCons

The file wasn't being comiling by CMake, remove it from SCons compilation as well.
Not sure if the same is required in original branch, maybe it'll be redone anyway.

For now let's make it so gooseberry branch is compiling nicely on the buildbot.