3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-05 13:03:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge branch 'master' into feature_support_meshes_present

Browse source 
# Conflicts:
#	cura/Scene/CuraSceneController.py
#	cura/Scene/CuraSceneNode.py
This commit is contained in:
fieldOfView 2020-06-04 10:27:11 +02:00
commit c34162a2ba
2961 changed files with 361563 additions and 555322 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cura/Scene/CuraSceneController.py
View file

@ -102,9 +102,10 @@ class CuraSceneController(QObject):
return True
return False
## Either select or deselect an item
@pyqtSlot(int)
def changeSelection(self, index):
"""Either select or deselect an item"""
modifiers = QApplication.keyboardModifiers()
ctrl_is_active = modifiers & Qt.ControlModifier
shift_is_active = modifiers & Qt.ShiftModifier