Merge branch 'master' into MalcolmTyrrell/spatialSortImprovements

code/AssetLib/3MF/XmlSerializer.cpp

@@ -159,7 +159,6 @@ bool parseColor(const char *color, aiColor4D &diffuse) {
         return false;
     }
 
-    //const char *buf(color);
     if ('#' != color[0]) {
         return false;
     }