diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2008-07-26 08:36:09 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2008-07-26 08:36:09 +0400 |
| commit | b059a3c765a59377fef22723acb11929d7fe70b6 (patch) | |
| tree | 311c2ad1f67fa8fcfb2875bb0c1af8bdaef3ebc4 /source/blender/blenkernel/intern/constraint.c | |
| parent | ad27c65d02de00d57343ec183849e476dcfae211 (diff) | |
svn merge -r15731:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/blenkernel/intern/constraint.c')
| -rw-r--r-- | source/blender/blenkernel/intern/constraint.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index 068501780bc..f13fd5f9963 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -558,8 +558,8 @@ static void contarget_get_mesh_mat (Object *ob, char *substring, float mat[][4]) if (dgroup < 0) return; /* get DerivedMesh */ - if (G.obedit && G.editMesh) { - /* we are in editmode, so get a special derived mesh */ + if ((G.obedit == ob) && (G.editMesh)) { + /* target is in editmode, so get a special derived mesh */ dm = CDDM_from_editmesh(G.editMesh, ob->data); } else { |