3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 15:13:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge, fix qml files. Contributes to CURA-2007.

Browse source 
Merge branch 'feature_quality_changes' into cura-2007

Conflicts:
	resources/qml/Settings/SettingItem.qml
	resources/qml/Settings/SettingView.qml
This commit is contained in:
Jack Ha 2016-08-04 18:22:36 +02:00
commit bfabf8d11a
10 changed files with 207 additions and 184 deletions
Download patch file Download diff file Expand all files Collapse all files

1
resources/qml/Settings/SettingView.qml
View file

@ -95,6 +95,7 @@ ScrollView
{
target: provider
property: "containerStackId"
when: model.settable_per_extruder || (inheritStackProvider.properties.global_inherits_stack != -1 && inheritStackProvider.properties.global_inherits_stack != null)
value:
{
if(inheritStackProvider.properties.global_inherits_stack == -1 || inheritStackProvider.properties.global_inherits_stack == null)