diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2007-01-06 03:25:22 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2007-01-06 03:25:22 +0300 |
| commit | 5c92969a5a63aa8dbd3a9e16f578e607f0c0aa42 (patch) | |
| tree | a3faf45c2a1d784f24f31e12c4690f2c66d599cd /source/blender/src/booleanops.c | |
| parent | 70d982f1d50f3fed123e79f531947b8380b9b3dd (diff) | |
Fix for bug #5583:
Crash when doing a boolean operation on a linked duplicate of the
same mesh.
Diffstat (limited to 'source/blender/src/booleanops.c')
| -rw-r--r-- | source/blender/src/booleanops.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/src/booleanops.c b/source/blender/src/booleanops.c index bbac4984231..8a0326ccc02 100644 --- a/source/blender/src/booleanops.c +++ b/source/blender/src/booleanops.c @@ -378,9 +378,9 @@ static DerivedMesh *ConvertCSGDescriptorsToDerivedMesh( face_it->Step(face_it->it); // find the original mesh and data - orig_me = (csgface.orig_face < me1->totface)? me1: me2; - orig_ob = (orig_me == me1)? ob1: ob2; - orig_index = (orig_me == me1)? csgface.orig_face: csgface.orig_face - me1->totface; + orig_ob = (csgface.orig_face < me1->totface)? ob1: ob2; + orig_me = (orig_ob == ob1)? me1: me2; + orig_index = (orig_ob == ob1)? csgface.orig_face: csgface.orig_face - me1->totface; // copy all face layers, including mface CustomData_copy_data(&orig_me->fdata, &dm->faceData, orig_index, i, 1); |