- don't need a guarded pointer here

- shorten variable, fix indentation

diff --git a/simgear/scene/model/model.cxx b/simgear/scene/model/model.cxx
index 449ee51bbe3113cea2b1de2dea3a9fb22417e40f..622e8fcd8c5025fff286c0aead8838dfaaa62891 100644 (file)
--- a/simgear/scene/model/model.cxx
+++ b/simgear/scene/model/model.cxx
@@ -352,10 +352,10 @@ sgLoad3DModel( const string &fg_root, const string &path,
       throw;
     }
 
-    SGPropertyNode_ptr cond_node = node->getNode("condition", false);
-    if (cond_node) {
-        align->setUserData(new SGConditionalRender(sgReadCondition(prop_root, cond_node)));
-        align->setTravCallback(SSG_CALLBACK_PRETRAV, model_condition_callback);
+    SGPropertyNode *cond = node->getNode("condition", false);
+    if (cond) {
+      align->setUserData(new SGConditionalRender(sgReadCondition(prop_root, cond)));
+      align->setTravCallback(SSG_CALLBACK_PRETRAV, model_condition_callback);
     }
 
     align->addKid(kid);