Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Q
qtquick3d
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Andy Nichols
qtquick3d
Commits
7c6d4b36
Commit
7c6d4b36
authored
6 years ago
by
Johan Helsing
Browse files
Options
Downloads
Patches
Plain Diff
Fix spelling of "primitive"
parent
8d3e2d48
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/plugins/assetimporters/uip/uipimporter.cpp
+1
-1
1 addition, 1 deletion
src/plugins/assetimporters/uip/uipimporter.cpp
src/quick3d/qdemonmodel.cpp
+2
-2
2 additions, 2 deletions
src/quick3d/qdemonmodel.cpp
with
3 additions
and
3 deletions
src/plugins/assetimporters/uip/uipimporter.cpp
+
1
−
1
View file @
7c6d4b36
...
...
@@ -190,7 +190,7 @@ void UipImporter::checkForResourceFiles(GraphObject *object)
QString
meshLocation
=
model
->
m_mesh_unresolved
;
// Remove trailing # directive
int
hashLocation
=
meshLocation
.
indexOf
(
"#"
);
// if mesh source starts with #, it's a prim
a
tive, so skip
// if mesh source starts with #, it's a prim
i
tive, so skip
if
(
hashLocation
==
1
)
return
;
if
(
hashLocation
!=
-
1
)
{
...
...
This diff is collapsed.
Click to expand it.
src/quick3d/qdemonmodel.cpp
+
2
−
2
View file @
7c6d4b36
...
...
@@ -198,11 +198,11 @@ QString QDemonModel::translateSource()
{
QString
fragment
;
if
(
m_source
.
hasFragment
())
{
// Check if this is an index, or prim
a
tive
// Check if this is an index, or prim
i
tive
bool
isNumber
=
false
;
m_source
.
fragment
().
toInt
(
&
isNumber
);
fragment
=
QStringLiteral
(
"#"
)
+
m_source
.
fragment
();
// If it wasn't an index, then it was a prim
a
tive
// If it wasn't an index, then it was a prim
i
tive
if
(
!
isNumber
)
return
fragment
;
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment