Blender Git Commit Log

Git Commits -> Revision aa00976

Revision aa00976 by Grigory Revzin (soc-2014-shapekey)
June 1, 2014, 21:26 (GMT)
Can mix shapekeys in editmode now

The user can now edit a shape key on top of a mix.

The difference to the master is that the 'Apply Shape Keys in Editmode' is gone completely. You can either pin the shapekey or edit on top of a mix: http://screenshot.su/img/a1/70/dc/a170dc61123ee1648e8a6dc3394b3812.jpg, and that is all.

The user can select the values that he wants to use in the mix: the animation-driven values (KeyBlock->curval) or a temporary mix value visible only in editmode.

Implementation-wise this is sort of an emulation of the shape keys modifier behavior. On editmode enter, the mesh keyblocks get evaluated and that is put in the edit coordinates. On shapekey switch or editmode exit the underlying mix gets subtracted from the editmesh cos, the resulting isolated shape coordinates gets adjusted for value (we store data with 1.0 values only!) and than processed as a normal (pinned) shape key update. Then the mesh gets re-evaluated, etc.

There is some optimization potential which will be explored!

Undo might be broken at the moment, this is the next thing to do.

Commit Details:

Full Hash: aa009766d66fefcc5b66170124b0b8ad049478ae
Parent Commit: 68e60b3
Lines Changed: +158, -47

10 Modified Paths:

/release/scripts/startup/bl_ui/properties_data_mesh.py (+1, -4) (Diff)
/source/blender/blenkernel/BKE_key.h (+5, -0) (Diff)
/source/blender/blenkernel/intern/key.c (+7, -8) (Diff)
/source/blender/blenkernel/intern/modifier.c (+0, -5) (Diff)
/source/blender/blenloader/intern/versioning_270.c (+2, -7) (Diff)
/source/blender/editors/include/ED_mesh.h (+2, -1) (Diff)
/source/blender/editors/mesh/editmesh_utils.c (+90, -17) (Diff)
/source/blender/editors/object/object_shapekey.c (+7, -0) (Diff)
/source/blender/makesrna/intern/rna_key.c (+44, -4) (Diff)
/source/blender/makesrna/intern/rna_object.c (+0, -1) (Diff)
By: Miika HämäläinenLast update: Nov-07-2014 14:18MiikaHweb | 2003-2021