diff options
| author | Enrico Turri <enricoturri@seznam.cz> | 2019-04-02 16:13:26 +0300 |
|---|---|---|
| committer | Enrico Turri <enricoturri@seznam.cz> | 2019-04-02 16:13:26 +0300 |
| commit | 89a0c84c835c775ffdb87d9b5d62ac6a4d046e8f (patch) | |
| tree | 729865ac19282c419d1a57e51889423c4307ae34 /src/slic3r/GUI/Selection.cpp | |
| parent | 83aaa471cf7b0d6b54528d01cdae288d35cb5c4f (diff) | |
| parent | ba4f0445c361c24bde074e1ab321debef5614a18 (diff) | |
Fixed conflicts after merge with master
Diffstat (limited to 'src/slic3r/GUI/Selection.cpp')
| -rw-r--r-- | src/slic3r/GUI/Selection.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/slic3r/GUI/Selection.cpp b/src/slic3r/GUI/Selection.cpp index 2de4ece47..bcf9bb61c 100644 --- a/src/slic3r/GUI/Selection.cpp +++ b/src/slic3r/GUI/Selection.cpp @@ -1704,7 +1704,7 @@ bool Selection::is_from_fully_selected_instance(unsigned int volume_idx) const GLVolumePtrs& volumes; SameInstance(int obj_idx, int inst_idx, GLVolumePtrs& volumes) : obj_idx(obj_idx), inst_idx(inst_idx), volumes(volumes) {} - bool operator () (unsigned int i) { return (volumes[i]->object_idx() == obj_idx) && (volumes[i]->instance_idx() == inst_idx); } + bool operator () (unsigned int i) { return (volumes[i]->volume_idx() >= 0) && (volumes[i]->object_idx() == obj_idx) && (volumes[i]->instance_idx() == inst_idx); } }; if ((unsigned int)m_volumes->size() <= volume_idx) |