diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-10-20 17:51:37 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-10-20 17:51:37 +0400 |
| commit | 1998fa59ae90c2346910dc622df0356a8644c28f (patch) | |
| tree | c383db925d5e84ccb016c2f512f7449c49659203 /source/blender/blenkernel/intern/object.c | |
| parent | a9f79ee5360261d00c72ed9528052fa3791d17f5 (diff) | |
fix for fix [#24336] evaluation time - curve has no effect
committed r32598 to fix [#24309] Reloading file with incorrect path location.
Setting the curves ctime when updating the object data overrode the animated value.
For now just set the ctime on newly added curves with will work as the user expects in most cases.
This is weak design IMHO because the ctime value can be set to anything but is reset on changing frames even if its not keyed.
With curves created via python or linked in this can still result in a bad ctime value.
Diffstat (limited to 'source/blender/blenkernel/intern/object.c')
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 1d7d5b6e243..142e41918dd 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -2560,12 +2560,6 @@ void object_handle_update(Scene *scene, Object *ob) makeDispListMBall(scene, ob); } else if(ELEM3(ob->type, OB_CURVE, OB_SURF, OB_FONT)) { - if(ob->type==OB_CURVE) { - /* cu->ctime is set on frame change but this is not enough when - * adding new curves, appending etc. This assignment could be moved - * but this ensures its always set esp before parenting: [#24309] */ - ((Curve *)ob->data)->ctime= ctime; - } makeDispListCurveTypes(scene, ob, 0); } else if(ELEM(ob->type, OB_CAMERA, OB_LAMP)) { |