瀏覽代碼

Fixed error duplicate symbol introduced in merge

Matt Benic 10 年之前
父節點
當前提交
0923e44177
共有 1 個文件被更改,包括 3 次插入1 次删除
  1. 3 1
      Script/AtomicEditor/ui/frames/inspector/MaterialInspector.ts

+ 3 - 1
Script/AtomicEditor/ui/frames/inspector/MaterialInspector.ts

@@ -59,7 +59,9 @@ var techniqueLookup = {
     "Techniques/DiffAdd.xml": "Additive",
     "Techniques/NoTexture.xml": "No Texture",
     "Techniques/DiffLightMap.xml": "Lightmap",
-    "Techniques/NoTexture.xml": "No Texture"
+    "Techniques/NoTexture.xml": "No Texture",
+    "Techniques/DiffLightMap.xml": "Lightmap",
+    "Techniques/DiffLightMapAlpha.xml": "Lightmap Alpha"
 };
 
 var techniqueReverseLookup = {};