Merge branch 'master' into themed-layer-view

This commit is contained in:
fieldOfView 2017-04-25 18:06:12 +02:00
commit 2493bd6fe6
289 changed files with 90651 additions and 67915 deletions

View file

@ -363,7 +363,7 @@ Item
property bool roundValues: true
property var activeHandle: upperHandle
property bool layersVisible: UM.LayerView.layerActivity && Printer.platformActivity ? true : false
property bool layersVisible: UM.LayerView.layerActivity && CuraApplication.platformActivity ? true : false
function getUpperValueFromHandle()
{