Merge pull request #13644 from wwmayer/default_material

Gui: expose ViewProviderGeometryObject::getUserDefinedMaterial() to Python

src/App/Material.cpp

@@ -39,16 +39,15 @@ using namespace App;
 Material::Material()
     : shininess {0.9000F}
     , transparency {}
-    , _matType {USER_DEFINED}
+    , _matType {}
 {
-    setType(STEEL);
-    setType(USER_DEFINED);
+    setType(DEFAULT);
 }
 
 Material::Material(const char* MatName)
     : shininess {0.9000F}
     , transparency {}
-    , _matType {USER_DEFINED}
+    , _matType {}
 {
     set(MatName);
 }
@@ -56,7 +55,7 @@ Material::Material(const char* MatName)
 Material::Material(MaterialType MatType)
     : shininess {0.9000F}
     , transparency {}
-    , _matType {USER_DEFINED}
+    , _matType {}
 {
     setType(MatType);
 }

src/App/PropertyStandard.cpp

@@ -2632,7 +2632,10 @@ TYPESYSTEM_SOURCE(App::PropertyMaterialList, App::PropertyLists)
 //**************************************************************************
 // Construction/Destruction
 
-PropertyMaterialList::PropertyMaterialList() = default;
+PropertyMaterialList::PropertyMaterialList()
+{
+    setSizeOne();
+}
 
 PropertyMaterialList::~PropertyMaterialList() = default;