Fix: missing null check in normal data assembler

gwaldron · Feb 4, 2015 · 4678b9f · 4678b9f
1 parent 00a5bd6
commit 4678b9f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/osgEarthDrivers/engine_mp/TileModelFactory.cpp b/src/osgEarthDrivers/engine_mp/TileModelFactory.cpp
@@ -361,7 +361,7 @@ TileModelFactory::buildNormalMap(const TileKey&    key,
     // Make a new heightfield:
     if (_normalHFCache->getOrCreateHeightField(frame, key, parentHF.get(), hf, isFallback, SAMPLE_FIRST_VALID, interp, progress))
     {
-        if ( isFallback )
+        if ( isFallback && parentModel.valid() )
         {
             model->_normalData = parentModel->_normalData;
             model->_normalData._fallbackData = true;
@@ -427,7 +427,7 @@ TileModelFactory::buildNormalMap(const TileKey&    key,
             }
         }
 
-        if ( isFallback && parentModel )
+        if ( isFallback && parentModel.valid() )
         {
             model->_normalTexture = parentModel->_normalTexture.get();
         }