diff options
| author | Ton Roosendaal <ton@blender.org> | 2004-09-30 01:44:12 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2004-09-30 01:44:12 +0400 |
| commit | 2c3e294ed51f5890a56ec6786ec71fca3c42bc31 (patch) | |
| tree | 2543d6bf9ba0a1ae60ee4a337d22e38d88afe303 /source/blender/src/buttons_editing.c | |
| parent | c42f0fc5cf6ddd7361297d9a65e2d0bd3a4b832f (diff) | |
- Previous commit broke selection of non-subsurf meshes :)
- fixed crash reported by SimonC on linked dupli meshes, editmode, set
subsurf on, crash...
Diffstat (limited to 'source/blender/src/buttons_editing.c')
| -rw-r--r-- | source/blender/src/buttons_editing.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c index e726bd12470..c2c738b836f 100644 --- a/source/blender/src/buttons_editing.c +++ b/source/blender/src/buttons_editing.c @@ -1072,14 +1072,16 @@ void do_curvebuts(unsigned short event) case B_MAKEDISP: if(ob->type==OB_FONT) text_to_curve(ob, 0); makeDispList(ob); - /* we need signal to send to other users of same data to recalc... */ - base= FIRSTBASE; - while(base) { - if(base->lay & G.vd->lay) { - if(base->object->data==ob->data && base->object!=ob) - makeDispList(base->object); + if(ob!=G.obedit) { // subsurf with linked dupli will crash + /* we need signal to send to other users of same data to recalc... */ + base= FIRSTBASE; + while(base) { + if(base->lay & G.vd->lay) { + if(base->object->data==ob->data && base->object!=ob) + makeDispList(base->object); + } + base= base->next; } - base= base->next; } allqueue(REDRAWVIEW3D, 0); allqueue(REDRAWINFO, 1); /* 1, because header->win==0! */ |