From 48c6c523ec9dd79c854d763550574418bee7c583 Mon Sep 17 00:00:00 2001
From: Jack Ha <j.ha@ultimaker.com>
Date: Mon, 20 Mar 2017 14:43:46 +0100
Subject: [PATCH 1/2] Only 3mf nodes with mesh data are getting the sliceable
 object decorator. CURA-3559

---
 plugins/3MFReader/ThreeMFReader.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/plugins/3MFReader/ThreeMFReader.py b/plugins/3MFReader/ThreeMFReader.py
index 60336a9553..d473ecaa8b 100755
--- a/plugins/3MFReader/ThreeMFReader.py
+++ b/plugins/3MFReader/ThreeMFReader.py
@@ -145,9 +145,11 @@ class ThreeMFReader(MeshReader):
             group_decorator = GroupDecorator()
             um_node.addDecorator(group_decorator)
         um_node.setSelectable(True)
-        # Assuming that all nodes are printable objects, affects (auto) slicing
-        sliceable_decorator = SliceableObjectDecorator()
-        um_node.addDecorator(sliceable_decorator)
+        if um_node.getMeshData():
+            # Assuming that all nodes with mesh data are printable objects
+            # affects (auto) slicing
+            sliceable_decorator = SliceableObjectDecorator()
+            um_node.addDecorator(sliceable_decorator)
         return um_node
 
     def read(self, file_name):

From b8d8e4fac33b0daa7a5e3dc212b9e7e705c6734e Mon Sep 17 00:00:00 2001
From: Jack Ha <j.ha@ultimaker.com>
Date: Mon, 20 Mar 2017 15:17:18 +0100
Subject: [PATCH 2/2] Updated changelog. CURA-3467

---
 plugins/ChangeLogPlugin/ChangeLog.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/ChangeLogPlugin/ChangeLog.txt b/plugins/ChangeLogPlugin/ChangeLog.txt
index 74218f10a4..81e8bfdbe2 100755
--- a/plugins/ChangeLogPlugin/ChangeLog.txt
+++ b/plugins/ChangeLogPlugin/ChangeLog.txt
@@ -1,6 +1,6 @@
 [2.5.0]
 *Speed.
-We’ve given the system a tweak, to make changing printers, profiles, materials and print cores even quicker than ever. That means less hanging around, more time printing. We’ve also adjusted the start-up speed, which is now five seconds faster.
+We’ve given the system a tweak, to make changing printers, profiles, materials, and print cores even quicker than ever. 3MF processing is also much faster now. Opening a 3MF file now takes one tenth of the time. That means less hanging around, more time printing.
 
 *Speedup engine – Multi-threading.
 This is one of the most significant improvements, making slicing even faster. Just like computers with multiple cores, Cura can process multiple operations at the same time. How’s that for efficient?