Skip to content

Commit 4f0436c

Browse files
committed
Fix an issue in which the --ico was trying to alter the internal format of an immutable texture
1 parent 42b68ce commit 4f0436c

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

src/osgEarth/GLUtils.cpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1880,9 +1880,6 @@ GLObjectsCompiler::compileAsync(
18801880
{
18811881
// no ICO available - just resolve the future immediately
18821882
result.resolve(node);
1883-
//Promise<osg::ref_ptr<osg::Node>> promise;
1884-
//result = promise; // .getFuture();
1885-
//promise.resolve(node);
18861883
}
18871884
}
18881885

@@ -1902,6 +1899,7 @@ GLObjectsCompiler::compileAsync(
19021899

19031900
// if there is an ICO available, schedule the GPU compilation
19041901
bool compileScheduled = false;
1902+
19051903
if (state != nullptr && !state->empty())
19061904
{
19071905
osg::ref_ptr<ICO> ico;
@@ -1922,9 +1920,6 @@ GLObjectsCompiler::compileAsync(
19221920
{
19231921
// no ICO available - just resolve the future immediately
19241922
result.resolve(node);
1925-
//Promise<osg::ref_ptr<osg::Node>> promise;
1926-
//result = promise; // .getFuture();
1927-
//promise.resolve(node);
19281923
}
19291924

19301925
return result;

0 commit comments

Comments
 (0)