fix build with MSVC11 aka 2012
This commit is contained in:
parent
52c8a19d4d
commit
05b9dd60e3
|
@ -60,6 +60,7 @@ PROPERTY_SOURCE(Gui::ViewProviderOrigin, Gui::ViewProviderGeometryObject)
|
|||
* Creates the view provider for an object group.
|
||||
*/
|
||||
ViewProviderOrigin::ViewProviderOrigin()
|
||||
: tempVisMode(false)
|
||||
{
|
||||
sPixmap = "CoordinateSystem";
|
||||
Visibility.setValue(false);
|
||||
|
|
|
@ -59,7 +59,7 @@ public:
|
|||
void setTemporaryVisibility(App::DocumentObject* obj, bool onoff);
|
||||
|
||||
private:
|
||||
bool tempVisMode = false;
|
||||
bool tempVisMode;
|
||||
Gui::Document* tempVisDoc;
|
||||
std::map<Gui::ViewProvider*, bool> tempVisMap;
|
||||
};
|
||||
|
|
|
@ -213,6 +213,7 @@ const bool Body::isSolidFeature(const App::DocumentObject* f)
|
|||
// Transformed Features inside a MultiTransform are not solid features
|
||||
return !isMemberOfMultiTransform(f);
|
||||
}
|
||||
return false;//DeepSOIC: work-in-progress?
|
||||
}
|
||||
|
||||
const bool Body::isAllowed(const App::DocumentObject* f)
|
||||
|
|
|
@ -37,6 +37,7 @@ namespace PartDesign {
|
|||
PROPERTY_SOURCE(PartDesign::FeatureAddSub, PartDesign::Feature)
|
||||
|
||||
FeatureAddSub::FeatureAddSub()
|
||||
: addSubType(Additive)
|
||||
{
|
||||
ADD_PROPERTY(AddSubShape,(TopoDS_Shape()));
|
||||
}
|
||||
|
|
|
@ -50,7 +50,7 @@ public:
|
|||
Part::PropertyPartShape AddSubShape;
|
||||
|
||||
protected:
|
||||
Type addSubType = Additive;
|
||||
Type addSubType;
|
||||
};
|
||||
|
||||
} //namespace PartDesign
|
||||
|
|
|
@ -38,6 +38,7 @@ namespace PartDesign {
|
|||
PROPERTY_SOURCE(PartDesign::FeaturePrimitive, PartDesign::FeatureAddSub)
|
||||
|
||||
FeaturePrimitive::FeaturePrimitive()
|
||||
: primitiveType(Box)
|
||||
{
|
||||
ADD_PROPERTY_TYPE(References, (0,0), "Primitive", (App::PropertyType)(App::Prop_None), "References to build the location of the primitive");
|
||||
}
|
||||
|
|
|
@ -60,7 +60,7 @@ protected:
|
|||
//calculate the position of the primitive from the support and the exis
|
||||
TopLoc_Location calculateLocation();
|
||||
|
||||
Type primitiveType = Box;
|
||||
Type primitiveType;
|
||||
};
|
||||
|
||||
class PartDesignExport Box : public PartDesign::FeaturePrimitive {
|
||||
|
|
|
@ -223,7 +223,7 @@ TaskDlgFeaturePick::TaskDlgFeaturePick(std::vector<App::DocumentObject*> &object
|
|||
const std::vector<TaskFeaturePick::featureStatus> &status,
|
||||
boost::function<bool (std::vector<App::DocumentObject*>)> afunc,
|
||||
boost::function<void (std::vector<App::DocumentObject*>)> wfunc)
|
||||
: TaskDialog()
|
||||
: TaskDialog(), accepted(false)
|
||||
{
|
||||
pick = new TaskFeaturePick(objects, status);
|
||||
Content.push_back(pick);
|
||||
|
|
|
@ -113,7 +113,7 @@ public:
|
|||
|
||||
protected:
|
||||
TaskFeaturePick *pick;
|
||||
bool accepted = false;
|
||||
bool accepted;
|
||||
boost::function<bool (std::vector<App::DocumentObject*>)> acceptFunction;
|
||||
boost::function<void (std::vector<App::DocumentObject*>)> workFunction;
|
||||
};
|
||||
|
|
|
@ -88,6 +88,8 @@ bool ViewProviderPrimitive::setEdit(int ModNum)
|
|||
else {
|
||||
return PartGui::ViewProviderPart::setEdit(ModNum);
|
||||
}*/
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user