Merge regression fix.

googlearchive · Sep 16, 2015 · 3360b57 · 3360b57
1 parent d3bcdd1
commit 3360b57
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/UnityExamples/ProjectSettings/ProjectSettings.asset b/UnityExamples/ProjectSettings/ProjectSettings.asset
@@ -151,7 +151,10 @@ PlayerSettings:
       m_Size: 48
     - m_Icon: {fileID: 2800000, guid: 87944d11c2cdb43679e685502eff846c, type: 3}
       m_Size: 36
-  m_BuildTargetBatching: []
+  m_BuildTargetBatching:
+  - m_BuildTarget: Android
+    m_StaticBatching: 1
+    m_DynamicBatching: 0
   m_BuildTargetGraphicsAPIs:
   - m_BuildTarget: AndroidPlayer
     m_APIs: 08000000