suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ Fix regressions by merge of draw style branch

Browse Source
This commit is contained in:
wmayer 2014-01-16 14:30:42 +01:00
parent 0575915815
commit 7813c5e5ed
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Gui/Icons/resource.qrc
View File

@ -95,12 +95,12 @@
<file>Part_Measure_Clear_All.svg</file> <file>Part_Measure_Clear_All.svg</file>
<file>Part_Measure_Toggle_All.svg</file> <file>Part_Measure_Toggle_All.svg</file>
<file>spaceball_button.svg</file> <file>spaceball_button.svg</file>
<file>SpNav-PanLR.png</file> <file>SpNav-PanLR.svg</file>
<file>SpNav-PanUD.png</file> <file>SpNav-PanUD.svg</file>
<file>SpNav-Roll.png</file> <file>SpNav-Roll.svg</file>
<file>SpNav-Spin.png</file> <file>SpNav-Spin.svg</file>
<file>SpNav-Tilt.png</file> <file>SpNav-Tilt.svg</file>
<file>SpNav-Zoom.png</file> <file>SpNav-Zoom.svg</file>
<file>DrawStyleAsIs.svg</file> <file>DrawStyleAsIs.svg</file>
<file>DrawStyleFlatLines.svg</file> <file>DrawStyleFlatLines.svg</file>
<file>DrawStylePoints.svg</file> <file>DrawStylePoints.svg</file>

5
src/Gui/View3DInventorViewer.cpp
View File

@ -142,8 +142,9 @@ SOQT_OBJECT_ABSTRACT_SOURCE(View3DInventorViewer);
View3DInventorViewer::View3DInventorViewer (QWidget *parent, const char *name, View3DInventorViewer::View3DInventorViewer (QWidget *parent, const char *name,
SbBool embed, Type type, SbBool build) SbBool embed, Type type, SbBool build)
: inherited (parent, name, embed, type, build), editViewProvider(0),navigation(0), : inherited (parent, name, embed, type, build), editViewProvider(0), navigation(0),
editing(FALSE), redirected(FALSE), overrideMode("As Is") framebuffer(0), axisCross(0), axisGroup(0), editing(FALSE), redirected(FALSE),
allowredir(FALSE), overrideMode("As Is")
{ {
Gui::Selection().Attach(this); Gui::Selection().Attach(this);