projects
/
simgear.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7e2ad05
)
Fix build when OSG implict-ref-ptr conversion is disabled.
author
James Turner
<zakalawe@mac.com>
Tue, 26 Oct 2010 09:09:55 +0000
(10:09 +0100)
committer
James Turner
<zakalawe@mac.com>
Tue, 26 Oct 2010 09:09:55 +0000
(10:09 +0100)
simgear/scene/material/TextureBuilder.cxx
patch
|
blob
|
history
diff --git
a/simgear/scene/material/TextureBuilder.cxx
b/simgear/scene/material/TextureBuilder.cxx
index a694ea661601754a90497db0e41cbe08e3a0519c..0e487a99bd7c84b39c173d7001abf6d4bebe96f8 100644
(file)
--- a/
simgear/scene/material/TextureBuilder.cxx
+++ b/
simgear/scene/material/TextureBuilder.cxx
@@
-236,8
+236,8
@@
void setAttrs(const TexTuple& attrs, Texture* tex,
= osgDB::Registry::instance()->readImage(imageName, options);
if (result.success()) {
osg::ref_ptr<osg::Image> image = result.getImage();
- image = computeMipmap( image, attrs.get<7>() );
- tex->setImage(GL_FRONT_AND_BACK, image);
+ image = computeMipmap( image
.get()
, attrs.get<7>() );
+ tex->setImage(GL_FRONT_AND_BACK, image
.get()
);
int s = image->s();
int t = image->t();
if (s <= t && 32 <= s) {