diff options
| author | Ton Roosendaal <ton@blender.org> | 2006-08-09 16:53:49 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2006-08-09 16:53:49 +0400 |
| commit | 86d72cb7d48003551269fcf9225037c23e8f0e09 (patch) | |
| tree | dd4a0012d47e49c8294bdbe60159a30d14ca8bee /source/blender/blenkernel/intern/effect.c | |
| parent | 6ca354f6600b570f1243661c01a64bee02ff12f1 (diff) | |
Bugfix #4810
Particle systems did not support "time offset" anymore, the varialble for
it in the object was cleared in build_particle_system() and never restored.
Diffstat (limited to 'source/blender/blenkernel/intern/effect.c')
| -rw-r--r-- | source/blender/blenkernel/intern/effect.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c index aad8fbfaf08..d18620283e4 100644 --- a/source/blender/blenkernel/intern/effect.c +++ b/source/blender/blenkernel/intern/effect.c @@ -1536,7 +1536,7 @@ static pMatrixCache *cache_object_matrices(Object *ob, int start, int end) Group *group= NULL; Object *obcopy; Base *base; - float framelenold, cfrao; + float framelenold, cfrao, sfo; /* object can be linked in group... stupid exception */ if(NULL==object_in_scene(ob, G.scene)) @@ -1547,8 +1547,9 @@ static pMatrixCache *cache_object_matrices(Object *ob, int start, int end) framelenold= G.scene->r.framelen; G.scene->r.framelen= 1.0f; cfrao= G.scene->r.cfra; + sfo= ob->sf; ob->sf= 0.0f; - + /* clear storage */ for(obcopy= G.main->object.first; obcopy; obcopy= obcopy->id.next) obcopy->id.newid= NULL; @@ -1600,7 +1601,8 @@ static pMatrixCache *cache_object_matrices(Object *ob, int start, int end) /* restore */ G.scene->r.cfra= cfrao; G.scene->r.framelen= framelenold; - + ob->sf= sfo; + if(group) { GroupObject *go; |