From 8d2e59e6594f853a54897db37a7a487656fc796b Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 6 Aug 2010 17:41:45 +0000 Subject: 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. --- source/blender/editors/space_view3d/drawobject.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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; } -- cgit v1.2.3