View difference between Paste ID: fZbxCwMB and 9kFZyLVr
SHOW: | | - or go back to the newest paste.
1
Index: AppEnv.cs
2
===================================================================
3
--- AppEnv.cs	(revision 6312)
4
+++ AppEnv.cs	(working copy)
5-
@@ -569,12 +569,18 @@
5+
@@ -569,7 +569,11 @@
6
         public string GenerateTerrainConfig()
7
         {
8
             MessageLine(" -------- Build terrain config -------- ");
9
-            terrainConfigObj.GenerateExpandedTask();
10
+            if (!terrainConfigObj.GenerateExpandedTask())
11
+            {
12
+                RunError("Failed build terrain config");
13
+                return null;
14
+            }
15-
+            AppEnv.Instance.MessageLine(AppEnv.Instance.vars.Count.ToString());
15+
16
             {
17
                 RunError("Failed build terrain config");
18
Index: Operations/TerrainConfig.cs
19-
                 return null;
19+
20-
             }
20+
21-
+            AppEnv.Instance.MessageLine(AppEnv.Instance.vars.Count.ToString());
21+
22-
             var path = terrainConfigObj.TerrainCfg.AbsoluteByRelativeTcons();
22+
23-
             MessageLine(path);
23+
24-
             MessageLine("");
24+
25
                                          "terrain config output directory isn't specified.", appEnv);
26
+            if (!ValidationResult)
27
+                return false;
28
             ValidateOnNullAndEmptyString("GEOTIFF",
29
                                          "elevation data (geotif) file isn't specified.", appEnv);
30
             ValidateOnNullAndEmptyString("DEFMATERIAL",
31
@@ -289,7 +291,8 @@
32
                                          "defmaterial isn't specified.", appEnv);
33
             ValidateOnNullAndEmptyString("IMAGE",
34
                                          "image file isn't specified.", appEnv);
35
-            return ValidationResult;
36
+            return true;
37
+            //return ValidationResult;
38
         }
39
 
40
         private void InitVariables()