Blender Git Loki
Git Commits -> Revision fdd1dfb
May 19, 2015, 12:50 (GMT) |
Unified code for identifying unconventional shapekey owners between gooseberry and alembic branches. The shapekey code has been modified in both branches, adding particle shapekeys in gooseberry and cache library shapekeys in alembic. The two approaches are slightly different, but based on the same idea of extending the 'from' owner info in Key, so that keys can be used without a 'from' ID and/or with an index for identification. This patch unifies the approach in both branches to make it slightly less messy and avoid merge conflicts. |
Commit Details:
Full Hash: fdd1dfb657386fd8042beeb7d4f3b35ed1fa72d7
Parent Commit: 3600b9f
Lines Changed: +87, -117
7 Modified Paths:
/source/blender/blenkernel/BKE_key.h (+1, -1) (Diff)
/source/blender/blenkernel/intern/cache_library.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/key.c (+69, -85) (Diff)
/source/blender/blenloader/intern/readfile.c (+3, -3) (Diff)
/source/blender/editors/object/object_shapekey.c (+4, -4) (Diff)
/source/blender/makesdna/DNA_key_types.h (+4, -18) (Diff)
/source/blender/makesrna/intern/rna_key.c (+4, -4) (Diff)
/source/blender/blenkernel/intern/cache_library.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/key.c (+69, -85) (Diff)
/source/blender/blenloader/intern/readfile.c (+3, -3) (Diff)
/source/blender/editors/object/object_shapekey.c (+4, -4) (Diff)
/source/blender/makesdna/DNA_key_types.h (+4, -18) (Diff)
/source/blender/makesrna/intern/rna_key.c (+4, -4) (Diff)