Merge pull request #4934 from turol/terragen_fix

Fix Terragen loader

code/AssetLib/Terragen/TerragenLoader.cpp

@@ -230,8 +230,8 @@ void TerragenImporter::InternReadFile(const std::string &pFile,
         }
 
         // Get to the next chunk (4 byte aligned)
-        unsigned dtt = reader.GetCurrentPos();
-        if (dtt & 0x3) {
+        unsigned dtt = reader.GetCurrentPos() & 0x3;
+        if (dtt) {
             reader.IncPtr(4 - dtt);
         }
     }

test/unit/ImportExport/Terragen/utTerragenImportExport.cpp

@@ -48,13 +48,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 class utTerragenImportExport : public AbstractImportExportBase {
 public:
     virtual bool importerTest() {
-        /*Assimp::Importer importer;
+        Assimp::Importer importer;
         const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/TER/RealisticTerrain.ter", aiProcess_ValidateDataStructure);
-        return nullptr != scene;*/
-        return true;
+        return nullptr != scene;
     }
 };
 
-TEST_F(utTerragenImportExport, importX3DFromFileTest) {
+TEST_F(utTerragenImportExport, importFromFileTest) {
     EXPECT_TRUE(importerTest());
 }