Blender Git Commit Log
Git Commits -> Revision 9f7961b
Revision 9f7961b by Sergey Sharybin (master) August 19, 2013, 10:36 (GMT) |
Optimization and threading fix for shapekeys weights calculation This commit fixes two different issues, which were caused by how weights are being calculated for relative shapekeys. Weights for key block used to saved in KeyBlock DNA structure, which lead to situations when different objects could start writing to the same weights array if they're sharing the same key datablock. Solved this in a way so weights are never stored in KeyBlock and being passed to shapekeys routines as an array of pointers. This way weights are still computed run-time (meaning they're calculated before shapekey evaluation and freed afterwards). This required some changes to GameEngine as well, to make it never cache weights in the key blocks. Another aspect of this commit makes it so weight for a given vertex group is only computed once. So if multiple key blocks are using the same influence vertex group, they'll share the same exact weights array. This gave around 1.7x speedup in test chinchilla file which is close enough to if we've been caching weights permanently in DNA (test machine is dual-code 4 threads laptop, speedup measured in depsgraph_mt branch, trunk might be not so much high speedup). Some further speed is optimization possible, but it could be done later as well. Thanks Brecht for idea of how the things might be solved in really clear way. -- svn merge -r58786:58787 ^/branches/soc-2013-depsgraph_mt |
Commit Details:
Full Hash: 9f7961b6b10203733ddda62dac3170d6817ff69b
SVN Revision: 59277
Parent Commit: bec9bcc
Lines Changed: +102, -98
7 Modified Paths:
/source/blender/blenkernel/BKE_key.h (+11, -1) (Diff)
/source/blender/blenkernel/intern/key.c (+83, -31) (Diff)
/source/blender/editors/mesh/meshtools.c (+0, -1) (Diff)
/source/blender/makesdna/DNA_key_types.h (+0, -1) (Diff)
/source/gameengine/Converter/BL_ShapeDeformer.cpp (+8, -4) (Diff)
/source/gameengine/Rasterizer/RAS_MeshObject.cpp (+0, -57) (Diff)
/source/gameengine/Rasterizer/RAS_MeshObject.h (+0, -3) (Diff)
/source/blender/blenkernel/intern/key.c (+83, -31) (Diff)
/source/blender/editors/mesh/meshtools.c (+0, -1) (Diff)
/source/blender/makesdna/DNA_key_types.h (+0, -1) (Diff)
/source/gameengine/Converter/BL_ShapeDeformer.cpp (+8, -4) (Diff)
/source/gameengine/Rasterizer/RAS_MeshObject.cpp (+0, -57) (Diff)
/source/gameengine/Rasterizer/RAS_MeshObject.h (+0, -3) (Diff)