Revert "Revert "DRTVWR-592: (WIP) Fix tiling only in the PBR case. Begin hooking up code for PBR-specific terrain geometry updates. Unfortunately, this version has a bug which can cause rebuilds to be skipped. Needs more work/testing""

This reverts commit 2318d657660320b921e1566b54d3833c0401a34c.

1 files changed, 8 insertions, 1 deletions

diff --git a/indra/newview/llvlcomposition.h b/indra/newview/llvlcomposition.h
index 9dc0b7221e..882c3d89b2 100644
--- a/indra/newview/llvlcomposition.h
+++ b/indra/newview/llvlcomposition.h
@@ -49,11 +49,18 @@ public:
 	// So we need to compress heights into this range.
     static const S32 ASSET_COUNT = 4;
 
+    enum class Type
+    {
+        TEXTURE,
+        PBR,
+        COUNT
+    };
+
     BOOL generateMaterials();
 
 	LLUUID getDetailAssetID(S32 asset);
 	virtual void setDetailAssetID(S32 asset, const LLUUID& id);
-    BOOL useTextures();
+    Type getMaterialType();
     BOOL texturesReady(BOOL boost = FALSE);
     BOOL materialsReady(BOOL boost = FALSE);