OpenXRay
diff --git a/‎Layers/xrRender/DetailManager_VS.cpp
Lines changed: 5 additions & 1 deletion b/‎Layers/xrRender/DetailManager_VS.cpp
Lines changed: 5 additions & 1 deletion
diff --git a/‎cop changelog.txt
Lines changed: 0 additions & 3 deletions b/‎cop changelog.txt
Lines changed: 0 additions & 3 deletions
@@ -319,11 +319,15 @@ void	CDetailManager::hw_Render_dump		(ref_constant x_array, u32 var_id, u32 lod_
 				RCache.stat.r.s_details.add	(dwCNT_verts);
 			}
 			// Clean up
+<<<<<<< HEAD
 			vis.clear_not_free			();
+=======
+      vis.clear_not_free ();      
+>>>>>>> origin/master
 		}
 		vOffset		+=	hw_BatchSize * Object.number_vertices;
 		iOffset		+=	hw_BatchSize * Object.number_indices;
 	}
 }
 
-#endif	//	USE_DX10
+#endif	//	USE_DX10
Original file line number	Diff line number	Diff line change
`@@ -319,11 +319,15 @@ void CDetailManager::hw_Render_dump (ref_constant x_array, u32 var_id, u32 lod_`
`319`	`319`	`RCache.stat.r.s_details.add (dwCNT_verts);`
`320`	`320`	`}`
`321`	`321`	`// Clean up`
	`322`	`+<<<<<<< HEAD`
`322`	`323`	`vis.clear_not_free ();`
	`324`	`+=======`
	`325`	`+ vis.clear_not_free ();`
	`326`	`+>>>>>>> origin/master`
`323`	`327`	`}`
`324`	`328`	`vOffset += hw_BatchSize * Object.number_vertices;`
`325`	`329`	`iOffset += hw_BatchSize * Object.number_indices;`
`326`	`330`	`}`
`327`	`331`	`}`
`328`	`332`
`329`		`-#endif // USE_DX10`
	`333`	`+#endif // USE_DX10`