Merge branch 'refs/heads/jriegel/develop-fem'

2013-06-27 16:47:40 +02:00
parent 16c594d20d fa1aa95a93
commit 415262bc0d
90 changed files with 20127 additions and 822 deletions
--- a/src/Gui/Application.cpp
+++ b/src/Gui/Application.cpp
@@ -98,6 +98,7 @@
 #include "ViewProviderMeasureDistance.h"
 #include "ViewProviderPlacement.h"
 #include "ViewProviderPlane.h"
+#include "ViewProviderMaterialObject.h"

 #include "Language/Translator.h"
 #include "TaskView/TaskDialogPython.h"
@@ -1464,6 +1465,8 @@ void Application::initTypes(void)
    Gui::ViewProviderPythonGeometry             ::init();
    Gui::ViewProviderPlacement                  ::init();
    Gui::ViewProviderPlane                      ::init();
+    Gui::ViewProviderMaterialObject             ::init();
+    Gui::ViewProviderMaterialObjectPython       ::init();

    // Workbench
    Gui::Workbench                              ::init();