+ implement PropertyMaterialListItem

FreeCAD · May 8, 2016 · f5b707e · f5b707e
1 parent e2d780a
commit f5b707e
Show file tree

Hide file tree

Showing 3 changed files with 241 additions and 82 deletions.
diff --git a/src/App/PropertyStandard.cpp b/src/App/PropertyStandard.cpp
@@ -2604,7 +2604,8 @@ void PropertyMaterialList::setPyObject(PyObject *value)
 
         for (Py::Sequence::iterator it = list.begin(); it != list.end(); ++it) {
             if (PyObject_TypeCheck((*it).ptr(), &(MaterialPy::Type))) {
-                materials.push_back(*static_cast<MaterialPy*>(value)->getMaterialPtr());
+                Material mat = *static_cast<MaterialPy*>((*it).ptr())->getMaterialPtr();
+                materials.push_back(mat);
             }
         }
 
@@ -2679,7 +2680,7 @@ void PropertyMaterialList::RestoreDocFile(Base::Reader &reader)
 
 const char* PropertyMaterialList::getEditorName(void) const
 {
-    return "";// "Gui::PropertyEditor::PropertyMaterialListItem";
+    return "Gui::PropertyEditor::PropertyMaterialListItem";
 }
 
 Property *PropertyMaterialList::Copy(void) const

diff --git a/src/Gui/SoFCDB.cpp b/src/Gui/SoFCDB.cpp
@@ -139,6 +139,7 @@ void Gui::SoFCDB::init()
     PropertyIntegerListItem         ::init();
     PropertyColorItem               ::init();
     PropertyMaterialItem            ::init();
+    PropertyMaterialListItem        ::init();
     PropertyFileItem                ::init();
     PropertyPathItem                ::init();
     PropertyTransientFileItem       ::init();