Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
OpenFlipper-Free
Plugin-FileOBJ
Commits
3a2dfe69
Commit
3a2dfe69
authored
May 11, 2016
by
Jan Möbius
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cppcheck fixes
parent
ad9e90dd
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
6 deletions
+7
-6
FileOBJ.cc
FileOBJ.cc
+6
-5
FileOBJ.hh
FileOBJ.hh
+1
-1
No files found.
FileOBJ.cc
View file @
3a2dfe69
...
...
@@ -114,7 +114,8 @@ FileOBJPlugin::FileOBJPlugin()
loadDefaultButton_
(
0
),
forceTriangleMesh_
(
false
),
forcePolyMesh_
(
false
),
textureIndexPropFetched_
(
false
)
textureIndexPropFetched_
(
false
),
trimeshOptions_
(
OBJImporter
::
NONE
)
{
}
...
...
@@ -1750,9 +1751,9 @@ void FileOBJPlugin::checkTypes(QByteArray& _bufferedFile, QString _filename, OBJ
case
TYPEASK
:
//ask
QMetaObject
::
invokeMethod
(
this
,
"handleTrimeshDialog"
,
Qt
::
BlockingQueuedConnection
);
if
(
trimeshOptions
==
OBJImporter
::
TRIMESH
)
if
(
trimeshOptions
_
==
OBJImporter
::
TRIMESH
)
_importer
.
forceMeshType
(
OBJImporter
::
TRIMESH
);
else
if
(
trimeshOptions
==
OBJImporter
::
POLYMESH
)
else
if
(
trimeshOptions
_
==
OBJImporter
::
POLYMESH
)
_importer
.
forceMeshType
(
OBJImporter
::
POLYMESH
);
break
;
...
...
@@ -1784,9 +1785,9 @@ void FileOBJPlugin::handleTrimeshDialog()
if
(
msgBox
.
clickedButton
()
==
triButton
)
trimeshOptions
=
OBJImporter
::
TRIMESH
;
trimeshOptions
_
=
OBJImporter
::
TRIMESH
;
else
if
(
msgBox
.
clickedButton
()
==
polyButton
)
trimeshOptions
=
OBJImporter
::
POLYMESH
;
trimeshOptions
_
=
OBJImporter
::
POLYMESH
;
}
//-----------------------------------------------------------------------------------------------------
...
...
FileOBJ.hh
View file @
3a2dfe69
...
...
@@ -253,7 +253,7 @@ class FileOBJPlugin : public QObject, BaseInterface, FileInterface, LoadSaveInte
QString
textureIndexPropertyName_
;
bool
textureIndexPropFetched_
;
std
::
map
<
int
,
QString
>
texIndexFileMap_
;
OBJImporter
::
ObjectOptionsE
trimeshOptions
;
OBJImporter
::
ObjectOptionsE
trimeshOptions
_
;
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment