Blender Git Loki

Merge branch 'master' into wiggly-widgets

Fix T42639, editcurve flags not getting restored on undo.

Error here could be reproduced by tweaking curve properties such as
2d-3d or fill type and undoing.

Initialize the snaping aspect just once.

Merge branch 'master' into gooseberry

Merge branch 'wiggly-widgets' into gooseberry

Fix crash with widgetgroup

Merge branch 'wiggly-widgets' into gooseberry

Conflicts:
source/blender/editors/include/ED_view3d.h
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/transform/transform_manipulator.c

lost instance of transform manipulator

Merge branch 'master' into wiggly-widgets

Bring back the old manipulator code, it works better with the transform
system for now. Backup the old code in a new file

Borrow transform system interaction: When arrow direction has direction
close to view direction, use up/down movement of mouse to calculate
offset.

warnings

Merge branch 'master' into gooseberry

More refinement to the widget system. Now camera widget should be
indistinguishable than the displayed widget (might probably be worth
deleting the original)

Arrow Widget:

Create a cross style widget, with wireframe cross.

Allows setting a custom scale for the arrow widget also, an up
orientation.

Add flag so widgets only draw on mouse over.

Camera widget now uses this, also now they only draw if limits is on.

Arrow widget interaction:

Fix interaction when pivot is beside the camera. basically we now do all
calculations in 3D space and we do not scale correct the offset in 3D -
this creates a nasty dependency loop between drawing and calculation for
widgets bound to properties - ie offset depends on scale but scale
depends on screen position - ie offset.

Also added an extra callback to get the final position of the widget in
3d space and use that to calculate the scale. This takes care of
bringing a close to the camera widget to the background and the widget
keeping its initial size. The final position can be different from the
initial position, especially when the widget is offset from the original
position.

Merge branch 'viewport_experiments' into gooseberry

Merge branch 'master' into viewport_experiments

Merge branch 'master' into viewport_experiments

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