diff options
| author | Ton Roosendaal <ton@blender.org> | 2005-07-14 01:28:43 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2005-07-14 01:28:43 +0400 |
| commit | 967e294d9c113e88cd2932ab82f53f218d0ef752 (patch) | |
| tree | 7636bd01613536e9b5a51d5fc4ae01e9883f917c /source/blender/blenkernel/intern/lattice.c | |
| parent | 682c51663eeb52602c04cbb151e1a5a952bc6d13 (diff) | |
Three fixes;
- Armature editmode, while armature was deforming children, was very slow
because it kept making subsurfs... this goes still hackish :)
- CTRL+A on armatures used loadsa old code, removed all of it! Still works.
- Using "Set smooth" or "Set solid" on file loaded without 3d window
crashed
Diffstat (limited to 'source/blender/blenkernel/intern/lattice.c')
| -rw-r--r-- | source/blender/blenkernel/intern/lattice.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c index 6e3dde28a53..01b9d0795c5 100644 --- a/source/blender/blenkernel/intern/lattice.c +++ b/source/blender/blenkernel/intern/lattice.c @@ -642,9 +642,11 @@ static int _object_deform(Object *ob, int applyflag) return 1; } else if(ob->parent->type==OB_ARMATURE) { - if (ob->partype != PARSKEL || ob->parent==G.obedit){ + if (ob->partype != PARSKEL) return 0; - } + + if (ob->parent==G.obedit) // misleading making displists... very bad + return 1; init_armature_deform (ob->parent, ob); |