diff options
author | Campbell Barton <ideasman42@gmail.com> | 2007-09-18 10:41:29 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2007-09-18 10:41:29 +0400 |
commit | 0a2b8b13089ef479d4a2d135b567410c8a5e6ab5 (patch) | |
tree | 3377b2bd39b6e7c2e3ce302a3bb01d7b2ddfbe25 /source/blender/python/api2_2x/World.c | |
parent | d86a03113d24904dd4b6227f16431eb6735aa5d7 (diff) |
A user submitted a BVH file that took a long time to import (I didnt end up finishing since it was so slow)
this is mainly because adding pose keyframes recalculates every handle so importing became increasingly slow.
added a 'fast' argument to insertkey that python api's insertPoseKey can make use of since it alredy accepts a 'fast' option.
The ~4450 frame, 31 bone BVH imports in ~108sec now
Seperated editmode switch statement in space.c's event handling,
if editmode is disabled, or the images is a render or composite, UV editing operations are ignored.
In previous releases it has given an annoying warning if selecting or scaling is attempted when out of UV/Face mode.
Diffstat (limited to 'source/blender/python/api2_2x/World.c')
-rw-r--r-- | source/blender/python/api2_2x/World.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/source/blender/python/api2_2x/World.c b/source/blender/python/api2_2x/World.c index 6d5b20b46d9..7804a443639 100644 --- a/source/blender/python/api2_2x/World.c +++ b/source/blender/python/api2_2x/World.c @@ -991,37 +991,37 @@ static PyObject *World_insertIpoKey( BPy_World * self, PyObject * args ) map = texchannel_to_adrcode(self->world->texact); if(key == IPOKEY_ZENITH) { - insertkey((ID *)self->world, ID_WO, NULL, NULL, WO_ZEN_R); - insertkey((ID *)self->world, ID_WO, NULL, NULL, WO_ZEN_G); - insertkey((ID *)self->world, ID_WO, NULL, NULL, WO_ZEN_B); + insertkey((ID *)self->world, ID_WO, NULL, NULL, WO_ZEN_R, 0); + insertkey((ID *)self->world, ID_WO, NULL, NULL, WO_ZEN_G, 0); + insertkey((ID *)self->world, ID_WO, NULL, NULL, WO_ZEN_B, 0); } if(key == IPOKEY_HORIZON) { - insertkey((ID *)self->world, ID_WO, NULL, NULL, WO_HOR_R); - insertkey((ID *)self->world, ID_WO, NULL, NULL, WO_HOR_G); - insertkey((ID *)self->world, ID_WO, NULL, NULL, WO_HOR_B); + insertkey((ID *)self->world, ID_WO, NULL, NULL, WO_HOR_R, 0); + insertkey((ID *)self->world, ID_WO, NULL, NULL, WO_HOR_G, 0); + insertkey((ID *)self->world, ID_WO, NULL, NULL, WO_HOR_B, 0); } if(key == IPOKEY_MIST) { - insertkey((ID *)self->world, ID_WO, NULL, NULL, WO_MISI); - insertkey((ID *)self->world, ID_WO, NULL, NULL, WO_MISTDI); - insertkey((ID *)self->world, ID_WO, NULL, NULL, WO_MISTSTA); - insertkey((ID *)self->world, ID_WO, NULL, NULL, WO_MISTHI); + insertkey((ID *)self->world, ID_WO, NULL, NULL, WO_MISI, 0); + insertkey((ID *)self->world, ID_WO, NULL, NULL, WO_MISTDI, 0); + insertkey((ID *)self->world, ID_WO, NULL, NULL, WO_MISTSTA, 0); + insertkey((ID *)self->world, ID_WO, NULL, NULL, WO_MISTHI, 0); } if(key == IPOKEY_STARS) { - insertkey((ID *)self->world, ID_WO, NULL, NULL, WO_STAR_R); - insertkey((ID *)self->world, ID_WO, NULL, NULL, WO_STAR_G); - insertkey((ID *)self->world, ID_WO, NULL, NULL, WO_STAR_B); - insertkey((ID *)self->world, ID_WO, NULL, NULL, WO_STARDIST); - insertkey((ID *)self->world, ID_WO, NULL, NULL, WO_STARSIZE); + insertkey((ID *)self->world, ID_WO, NULL, NULL, WO_STAR_R, 0); + insertkey((ID *)self->world, ID_WO, NULL, NULL, WO_STAR_G, 0); + insertkey((ID *)self->world, ID_WO, NULL, NULL, WO_STAR_B, 0); + insertkey((ID *)self->world, ID_WO, NULL, NULL, WO_STARDIST, 0); + insertkey((ID *)self->world, ID_WO, NULL, NULL, WO_STARSIZE, 0); } if(key == IPOKEY_OFFSET) { - insertkey((ID *)self->world, ID_WO, NULL, NULL, map+MAP_OFS_X); - insertkey((ID *)self->world, ID_WO, NULL, NULL, map+MAP_OFS_Y); - insertkey((ID *)self->world, ID_WO, NULL, NULL, map+MAP_OFS_Z); + insertkey((ID *)self->world, ID_WO, NULL, NULL, map+MAP_OFS_X, 0); + insertkey((ID *)self->world, ID_WO, NULL, NULL, map+MAP_OFS_Y, 0); + insertkey((ID *)self->world, ID_WO, NULL, NULL, map+MAP_OFS_Z, 0); } if(key == IPOKEY_SIZE) { - insertkey((ID *)self->world, ID_WO, NULL, NULL, map+MAP_SIZE_X); - insertkey((ID *)self->world, ID_WO, NULL, NULL, map+MAP_SIZE_Y); - insertkey((ID *)self->world, ID_WO, NULL, NULL, map+MAP_SIZE_Z); + insertkey((ID *)self->world, ID_WO, NULL, NULL, map+MAP_SIZE_X, 0); + insertkey((ID *)self->world, ID_WO, NULL, NULL, map+MAP_SIZE_Y, 0); + insertkey((ID *)self->world, ID_WO, NULL, NULL, map+MAP_SIZE_Z, 0); } allspace(REMAKEIPO, 0); |