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/Lamp.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/Lamp.c')
| -rw-r--r-- | source/blender/python/api2_2x/Lamp.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/source/blender/python/api2_2x/Lamp.c b/source/blender/python/api2_2x/Lamp.c index fc8a7809de1..d40cc5a2cfc 100644 --- a/source/blender/python/api2_2x/Lamp.c +++ b/source/blender/python/api2_2x/Lamp.c @@ -1287,25 +1287,25 @@ static PyObject *Lamp_insertIpoKey( BPy_Lamp * self, PyObject * args ) map = texchannel_to_adrcode(self->lamp->texact); if (key == IPOKEY_RGB ) { - insertkey((ID *)self->lamp, ID_LA, NULL, NULL, LA_COL_R); - insertkey((ID *)self->lamp, ID_LA, NULL, NULL,LA_COL_G); - insertkey((ID *)self->lamp, ID_LA, NULL, NULL,LA_COL_B); + insertkey((ID *)self->lamp, ID_LA, NULL, NULL, LA_COL_R, 0); + insertkey((ID *)self->lamp, ID_LA, NULL, NULL,LA_COL_G, 0); + insertkey((ID *)self->lamp, ID_LA, NULL, NULL,LA_COL_B, 0); } if (key == IPOKEY_ENERGY ) { - insertkey((ID *)self->lamp, ID_LA, NULL, NULL,LA_ENERGY); + insertkey((ID *)self->lamp, ID_LA, NULL, NULL,LA_ENERGY, 0); } if (key == IPOKEY_SPOTSIZE ) { - insertkey((ID *)self->lamp, ID_LA, NULL, NULL,LA_SPOTSI); + insertkey((ID *)self->lamp, ID_LA, NULL, NULL,LA_SPOTSI, 0); } if (key == IPOKEY_OFFSET ) { - insertkey((ID *)self->lamp, ID_LA, NULL, NULL, map+MAP_OFS_X); - insertkey((ID *)self->lamp, ID_LA, NULL, NULL, map+MAP_OFS_Y); - insertkey((ID *)self->lamp, ID_LA, NULL, NULL, map+MAP_OFS_Z); + insertkey((ID *)self->lamp, ID_LA, NULL, NULL, map+MAP_OFS_X, 0); + insertkey((ID *)self->lamp, ID_LA, NULL, NULL, map+MAP_OFS_Y, 0); + insertkey((ID *)self->lamp, ID_LA, NULL, NULL, map+MAP_OFS_Z, 0); } if (key == IPOKEY_SIZE ) { - insertkey((ID *)self->lamp, ID_LA, NULL, NULL, map+MAP_SIZE_X); - insertkey((ID *)self->lamp, ID_LA, NULL, NULL, map+MAP_SIZE_Y); - insertkey((ID *)self->lamp, ID_LA, NULL, NULL, map+MAP_SIZE_Z); + insertkey((ID *)self->lamp, ID_LA, NULL, NULL, map+MAP_SIZE_X, 0); + insertkey((ID *)self->lamp, ID_LA, NULL, NULL, map+MAP_SIZE_Y, 0); + insertkey((ID *)self->lamp, ID_LA, NULL, NULL, map+MAP_SIZE_Z, 0); } allspace(REMAKEIPO, 0); |