Blender Git Loki
Git Commits -> Revision 4c02209
Revision 4c02209 by Grigory Revzin (soc-2014-shapekey) May 18, 2014, 22:34 (GMT) |
Moved Object->shapeflag to Key->pin Since we aren't going to use the shape key modifier for editmode blending, Apply Shape Keys in Editmode is now obsolete too, and shapeflag just says is the key is pinned or not. Why to do this? In editmode, we want to be able to switch from Blending shapekeys to pinned shapekeys and this is done in key RNA update handler, so we want it to be called when pinning changes. The RNA property was removed from the Object and added to the Key, all code that referenced Object->shapeflag now references Key->pin. The UI was updated to accomodate for that. Unrelated change which I couldn't stage seperately is that there is now support for temporary mix values from RNA and UI. The user can select which one to use in Editmode. The value in the UI will automatically reflect the editmix or the animation mix, transparent for the artist. |
Commit Details:
Full Hash: 4c02209769c79d98d5e74dabb3b9c16aac7f43e2
Parent Commit: 097178e
Lines Changed: +88, -39
15 Modified Paths:
/release/scripts/startup/bl_ui/properties_data_mesh.py (+22, -17) (Diff)
/source/blender/blenkernel/intern/cdderivedmesh.c (+4, -1) (Diff)
/source/blender/blenkernel/intern/depsgraph.c (+4, -3) (Diff)
/source/blender/blenkernel/intern/key.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/modifier.c (+4, -2) (Diff)
/source/blender/blenkernel/intern/object.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/paint.c (+3, -2) (Diff)
/source/blender/blenloader/intern/versioning_270.c (+14, -0) (Diff)
/source/blender/editors/mesh/editmesh_utils.c (+1, -1) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+1, -1) (Diff)
/source/blender/makesdna/DNA_key_types.h (+2, -1) (Diff)
/source/blender/makesdna/DNA_object_types.h (+1, -7) (Diff)
/source/blender/makesrna/intern/rna_key.c (+25, -1) (Diff)
/source/blender/makesrna/intern/rna_object.c (+4, -0) (Diff)
/source/blender/modifiers/intern/MOD_shapekey.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/cdderivedmesh.c (+4, -1) (Diff)
/source/blender/blenkernel/intern/depsgraph.c (+4, -3) (Diff)
/source/blender/blenkernel/intern/key.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/modifier.c (+4, -2) (Diff)
/source/blender/blenkernel/intern/object.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/paint.c (+3, -2) (Diff)
/source/blender/blenloader/intern/versioning_270.c (+14, -0) (Diff)
/source/blender/editors/mesh/editmesh_utils.c (+1, -1) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+1, -1) (Diff)
/source/blender/makesdna/DNA_key_types.h (+2, -1) (Diff)
/source/blender/makesdna/DNA_object_types.h (+1, -7) (Diff)
/source/blender/makesrna/intern/rna_key.c (+25, -1) (Diff)
/source/blender/makesrna/intern/rna_object.c (+4, -0) (Diff)
/source/blender/modifiers/intern/MOD_shapekey.c (+1, -1) (Diff)