Bring BrushDescriptor.cs in line with PT's version

Change-Id: Ie090128ffce3de26892a8cca2be5b96eb324b575
googlevr · Dec 4, 2017 · dc9d1cd · dc9d1cd
1 parent db6c358
commit dc9d1cd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/UnitySDK/Assets/TiltBrush/Scripts/BrushDescriptor.cs b/UnitySDK/Assets/TiltBrush/Scripts/BrushDescriptor.cs
@@ -25,9 +25,12 @@ public enum Semantic {
     Unspecified,
     Position,
     Vector,
-    ZIsDistance,
+    XyIsUvZIsDistance,
+    UnitlessVector,
+    XyIsUv,
   }
 
+  public Material Material { get { return m_Material; } }
   public SerializableGuid m_Guid;
   [Tooltip("A human readable name that cannot change, but is not guaranteed to be unique.")]
   public string m_DurableName;

diff --git a/UnitySDK/Assets/TiltBrush/Scripts/Editor/ModelImportSettings.cs b/UnitySDK/Assets/TiltBrush/Scripts/Editor/ModelImportSettings.cs
@@ -223,7 +223,7 @@ static int GetUvsetSize(BrushDescriptor desc, int uvSet) {
   void FixupHypercolorTexcoord(BrushDescriptor desc, Mesh mesh) {
     int uvSet = 0;
     var semantic = GetUvsetSemantic(desc, uvSet);
-    if (semantic != BrushDescriptor.Semantic.ZIsDistance ||
+    if (semantic != BrushDescriptor.Semantic.XyIsUvZIsDistance ||
         GetUvsetSize(desc, uvSet) != 3) {
       LogWarningWithContext("Not hypercolor?");
     }