Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
OpenFlipper
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
OpenFlipper-Free
OpenFlipper
Commits
c2a1ca55
Commit
c2a1ca55
authored
Mar 22, 2018
by
Jan Möbius
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'tex2d-fix-variable-mixup' into 'master'
Fix variable mixup from
e8f64be6
See merge request
!69
parents
575f9c4f
b6c8c307
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
libs_required/ACG/GL/globjects.cc
libs_required/ACG/GL/globjects.cc
+1
-1
No files found.
libs_required/ACG/GL/globjects.cc
View file @
c2a1ca55
...
...
@@ -640,7 +640,7 @@ bool Texture2D::loadFromFile( const std::string& _filename, GLenum _minFilter, G
if
(
mipmaps
)
autogenerateMipMaps
();
QImage
gltex
=
ACG
::
Util
::
convertToGLFormat
(
gl
tex
);
QImage
gltex
=
ACG
::
Util
::
convertToGLFormat
(
q
tex
);
setData
(
0
,
GL_RGBA
,
gltex
.
width
(),
gltex
.
height
(),
GL_RGBA
,
GL_UNSIGNED_BYTE
,
gltex
.
bits
());
}
...
...
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