diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-08-06 21:41:45 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-08-06 21:41:45 +0400 |
| commit | 8d2e59e6594f853a54897db37a7a487656fc796b (patch) | |
| tree | a399a303777c7355dd9302e2259f4863051a5a6d /source/blender/editors | |
| parent | 6d5043a5294fe9b2414a32292d531c3384c42289 (diff) | |
Fix #22961: linked duplicate meshes are all displayed in edit mode when
one of them is in edit mode. This doesn't give correct results for modifiers
though, there was already a check to disable this when are shape keys, so
now it is also disabled if either of the meshes has modifiers.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index adbb326902e..741b7848543 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -2727,7 +2727,8 @@ static int draw_mesh_object(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D int do_alpha_pass= 0, drawlinked= 0, retval= 0, glsl, check_alpha; if(obedit && ob!=obedit && ob->data==obedit->data) { - if(ob_get_key(ob)); + if(ob_get_key(ob) || ob_get_key(obedit)); + else if(ob->modifiers.first || obedit->modifiers.first); else drawlinked= 1; } |