From 503a24f7a196262be9078892d7daedd5a444b725 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 3 Sep 2019 15:08:41 +0200 Subject: [PATCH] Make magic value into funtion (max face-id). part of CURA-6745 --- cura/CuraActions.py | 2 +- plugins/SolidView/SolidView.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cura/CuraActions.py b/cura/CuraActions.py index 0f2878023d..9338521003 100644 --- a/cura/CuraActions.py +++ b/cura/CuraActions.py @@ -85,7 +85,7 @@ class CuraActions(QObject): original_node, face_id = selected_face meshdata = original_node.getMeshDataTransformed() - if not meshdata or face_id < 0 or face_id > 0x10001: + if not meshdata or face_id < 0 or face_id > Selection.endFaceSelectionId(): return rotation_point, face_normal = meshdata.getFacePlane(face_id) diff --git a/plugins/SolidView/SolidView.py b/plugins/SolidView/SolidView.py index 38bc5eada8..da18c328d1 100644 --- a/plugins/SolidView/SolidView.py +++ b/plugins/SolidView/SolidView.py @@ -140,9 +140,9 @@ class SolidView(View): 1.0 ] - # Color the currently selected face-id, 0x10001 is certain to be greater than the largest ID. + # Color the currently selected face-id. face = Selection.getSelectedFace() - uniforms["selected_face"] = 0x10001 if not face or node != face[0] else face[1] + uniforms["selected_face"] = Selection.endFaceSelectionId() if not face or node != face[0] else face[1] except ValueError: pass