[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31115] trunk/blender/source/blender/ editors/space_view3d/drawobject.c: Fix #22961: linked duplicate meshes are all displayed in edit mode when

[Brecht Van Lommel]

Revision: 31115
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31115
Author:   blendix
Date:     2010-08-06 19:41:45 +0200 (Fri, 06 Aug 2010)

Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/drawobject.c

Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c	2010-08-06 17:35:07 UTC (rev 31114)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c	2010-08-06 17:41:45 UTC (rev 31115)
@@ -2727,7 +2727,8 @@
 	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;
 	}