diff options
| author | Ton Roosendaal <ton@blender.org> | 2009-01-10 22:34:23 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2009-01-10 22:34:23 +0300 |
| commit | 1beef956ca96c76e3ee7d6ba80d0c88e2b92b258 (patch) | |
| tree | c6c52bf29ac8ef8278d4061761a6e91f1b0f4c88 /source/blender/blenkernel/intern/softbody.c | |
| parent | 3c2b772a23728361b060a406528f6f2a422a278f (diff) | |
2.5
Instead of many commits, here 1!
- Constraint edit code back
- Removed XXX stubs for constraints
(make parent follow path works)
- Removed XXX stubs for armature
(make parent deform, do center, etc works)
- Found a bad uninitialized global Scene * in code, especially
in kernel it wreaked havoc.
- added missing include in blenkernel/brush.c
- fixed Nicholas' fix for editmode subsurf crash
(It needed to check for editmode)
Diffstat (limited to 'source/blender/blenkernel/intern/softbody.c')
| -rw-r--r-- | source/blender/blenkernel/intern/softbody.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index 422218e2957..70a2e9ca3a3 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -3567,7 +3567,7 @@ static void springs_from_particles(Object *ob) } } -static void particles_to_softbody(Object *ob) +static void particles_to_softbody(Scene *scene, Object *ob) { SoftBody *sb; BodyPoint *bp; @@ -4111,7 +4111,7 @@ void sbObjectStep(Scene *scene, Object *ob, float cfra, float (*vertexCos)[3], i ((ob->softflag & OB_SB_EDGES) && !ob->soft->bspring && object_has_edges(ob))) { if(sb->particles){ - particles_to_softbody(ob); + particles_to_softbody(scene, ob); } else { switch(ob->type) { |