Blender Git Loki

Armatures support proper undo now.

Keep keyframes on undo

WIP code to tag fcurves with existing keyframes on current frame so they
can be restored (inserted into) after cancelling tranform.

Merge branch 'master' into gooseberry

Merge branch 'master' into gooseberry

Conflicts:
source/blender/editors/space_view3d/view3d_draw.c
source/blender/physics/intern/BPH_mass_spring.cpp

Cleanup: unused var

Merge branch 'master' into gooseberry

Only insert/delete keyframes automatically if the real time motionpath
update is on.

Revert "Fix blenderplayer not compiling after modifier d&d commit"

This reverts commit 1a0e6336d62a2c8f9428704e9bcb6bbf799125e1.

Revert "Modifier Drag&Drop"

This reverts commit 91d0f6f1139054abcfca3d8044eae6e2bb82fb9a.

Artists here seem to dislike the interface being stuck after a change to
modifiers, reverting until an interactive solution is coded.

Minor stuff

Remove inserted keyframes if transform was cancelled

Merge branch 'gooseberry' into temp_motionpaths

Don't push merge without building first fix.

Merge branch 'wiggly-widgets' into gooseberry

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

Transform widget: Don't highlight rectangle (cursor should be enough
indication)

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

Fix blenderplayer not compiling after modifier d&d commit

Fix access freed memory when doing constraints ID counter on main free

Basically just made constraints free function aware of possible do_id_users
argument, same as we've got for objects, object data and so on.

Fix T43905: Crash happens when press Create Plane Track

It was only happening on 32bit platforms because of alignment
differences when allocating class.

Now got rid of copy of eigen matricies stored by value in the
residual block which solves aligment issues and should also
give some unmeasurable speedup.

Fix issue reported on irc by Sebastian, crash when undoing and changing
screen.

Apparently the screen on the given file did not have a scene attached.

Not sure how this is possible exactly, but for now just guard against it
at load time by assigning default scene in that case.