simgear/scene/sky/sky.cxx: Include sg_inlines.h with simgear/ prefix as all other...

[simgear.git] / simgear / scene / model / model.cxx

diff --git a/simgear/scene/model/model.cxx b/simgear/scene/model/model.cxx
index 41fe9a307f635e2affb1347c856e389d5df5227d..648b670aaf7ee4ad3032b0fb8989464f52d20027 100644 (file)
--- a/simgear/scene/model/model.cxx
+++ b/simgear/scene/model/model.cxx
@@ -264,7 +264,7 @@ void MakeEffectVisitor::apply(osg::Geode& geode)
     makeParametersFromStateSet(ssRoot, ss);
     SGPropertyNode_ptr effectRoot = new SGPropertyNode;
     effect::mergePropertyTrees(effectRoot, ssRoot, _currentEffectParent);
-    Effect* effect = makeEffect(effectRoot, true, _options);
+    Effect* effect = makeEffect(effectRoot, true, _options.get());
     EffectGeode* eg = dynamic_cast<EffectGeode*>(&geode);
     if (eg) {
         eg->setEffect(effect);
@@ -274,7 +274,7 @@ void MakeEffectVisitor::apply(osg::Geode& geode)
         ref_ptr<SGSceneUserData> userData = SGSceneUserData::getSceneUserData(&geode);
         if (userData.valid())
             eg->setUserData(new SGSceneUserData(*userData));
-        for (int i = 0; i < geode.getNumDrawables(); ++i) {
+        for (unsigned i = 0; i < geode.getNumDrawables(); ++i) {
             osg::Drawable *drawable = geode.getDrawable(i);
             eg->addDrawable(drawable);