allow non-sketch based additive and subtractive features

src/Mod/PartDesign/App/AppPartDesign.cpp.orig

@@ -40,8 +40,12 @@
 #include "FeatureDressUp.h"
 #include "FeatureChamfer.h"
 #include "FeatureDraft.h"
+<<<<<<< c3c1399b7e8f8ceea8f3c1288ebfe0b6575f4d90
 #include "FeatureSubtractive.h"
 #include "FeatureAdditive.h"
+=======
+#include "FeatureFace.h"
+>>>>>>> allow non-sketch based additive and subtractive features
 #include "FeatureTransformed.h"
 #include "FeatureMirrored.h"
 #include "FeatureLinearPattern.h"
@@ -49,7 +53,10 @@
 #include "FeatureScaled.h"
 #include "FeatureMultiTransform.h"
 #include "FeatureHole.h"
-#include "DatumFeature.h"
+#include "DatumPlane.h"
+#include "DatumLine.h"
+#include "DatumPoint.h"
+#include "FeatureBoolean.h"
 
 extern struct PyMethodDef PartDesign_methods[];
 
@@ -81,9 +88,8 @@ void PartDesignExport init_PartDesign()
     PartDesign::Feature            ::init();
     PartDesign::Solid              ::init();
     PartDesign::DressUp            ::init();
+    PartDesign::FeatureAddSub      ::init();
     PartDesign::SketchBased        ::init();
-    PartDesign::Subtractive        ::init();
-    PartDesign::Additive           ::init();
     PartDesign::Transformed        ::init();
     PartDesign::Mirrored           ::init();
     PartDesign::LinearPattern      ::init();
@@ -98,16 +104,15 @@ void PartDesignExport init_PartDesign()
     PartDesign::Revolution         ::init();
     PartDesign::Groove             ::init();
     PartDesign::Chamfer            ::init();
-<<<<<<< b1f11745d3f535813e5dea41f7a12b14fbd6389f
-    PartDesign::Draft           ::init();
-=======
-    PartDesign::Face               ::init();
     PartDesign::Draft              ::init();
-    PartDesign::Datum              ::init();
     PartDesign::Plane              ::init();
     PartDesign::Line               ::init();
     PartDesign::Point              ::init();
->>>>>>> Second step for implementing datum features
+    PartDesign::Boolean            ::init();
+
+    PartDesign::Point::initHints();
+    PartDesign::Line ::initHints();
+    PartDesign::Plane::initHints();
 }
 
 } // extern "C"