Merge pull request #305 from Unity-Technologies/Branch_LayeredPhoto-FixUV2

Fixed UV2 for legacy layered shader.

Assets/LegacyLayered/UnityLayeredPhotogrammetryCore.cginc

 
 // BEGIN LAYERED_PHOTOGRAMMETRY
 #define FRAGMENT_SETUP(x) FragmentCommonData x = \
-    FragmentSetupLayeredPhotogrammetry(i.pos, i.tex, float4(i.ambientOrLightmapUV.xy, i.texUV3), i.color, i.eyeVec, i.tangentToWorldAndPackedData, IN_WORLDPOS(i));
+    FragmentSetupLayeredPhotogrammetry(i.pos, i.tex, float4(i.ambientOrLightmapUV.zw, i.texUV3), i.color, i.eyeVec, i.tangentToWorldAndPackedData, IN_WORLDPOS(i));
 
 // JIG CHECK
 #define FRAGMENT_SETUP_FWDADD(x) FragmentCommonData x = \
         ambientOrLightmapUV.rgb = ShadeSHPerVertex (normalWorld, ambientOrLightmapUV.rgb);
     #endif
 
-    #ifdef DYNAMICLIGHTMAP_ON
+    //#ifdef DYNAMICLIGHTMAP_ON
-    #endif
+    //#endif
 
     return ambientOrLightmapUV;
 }
     #elif UNITY_SHOULD_SAMPLE_SH
         o.ambientOrLightmapUV.rgb = ShadeSHPerVertex (normalWorld, o.ambientOrLightmapUV.rgb);
     #endif
-    #ifdef DYNAMICLIGHTMAP_ON
+    //#ifdef DYNAMICLIGHTMAP_ON
-    #endif
+    //#endif
 
     #ifdef _PARALLAXMAP
         TANGENT_SPACE_ROTATION;

Assets/LegacyLayered/UnityLayeredPhotogrammetryInput.cginc

     half3 normal    : NORMAL;
     float2 uv0      : TEXCOORD0;
     float2 uv1      : TEXCOORD1;
-#if defined(DYNAMICLIGHTMAP_ON) || defined(UNITY_PASS_META)
+//#if defined(DYNAMICLIGHTMAP_ON) || defined(UNITY_PASS_META)
-#endif
+//#endif
 
     // BEGIN LAYERED_PHOTOGRAMMETRY
     half4 color     : COLOR;