Merge branch 'master' into layer_view3_cleanup

This commit is contained in:
Jack Ha 2017-02-15 10:57:24 +01:00
commit 78de5412a2
95 changed files with 3279 additions and 683 deletions

View file

@ -1,6 +1,6 @@
from UM.Math.Color import Color
from UM.Application import Application
from typing import Any
import numpy
@ -198,7 +198,7 @@ class LayerPolygon:
return normals
__color_map = None
__color_map = None # type: numpy.ndarray[Any]
## Gets the instance of the VersionUpgradeManager, or creates one.
@classmethod